[kernel] r19836 - in dists/trunk/linux/debian/config: . i386 kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Thu Feb 21 05:09:00 2013
New Revision: 19836

Log:
Explicitly set defaults for several config variables

Modified:
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/i386/config.686-pae
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Thu Feb 21 04:52:25 2013	(r19835)
+++ dists/trunk/linux/debian/config/config	Thu Feb 21 05:09:00 2013	(r19836)
@@ -4203,6 +4203,7 @@
 ##
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_KSM=y

Modified: dists/trunk/linux/debian/config/i386/config.686-pae
==============================================================================
--- dists/trunk/linux/debian/config/i386/config.686-pae	Thu Feb 21 04:52:25 2013	(r19835)
+++ dists/trunk/linux/debian/config/i386/config.686-pae	Thu Feb 21 05:09:00 2013	(r19836)
@@ -10,6 +10,9 @@
 CONFIG_X86_PAE=y
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_EISA is not set
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
 
 ##
 ## file: arch/x86/Kconfig.cpu

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Feb 21 04:52:25 2013	(r19835)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Feb 21 05:09:00 2013	(r19836)
@@ -52,6 +52,8 @@
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_RELOCATABLE=y
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PCI=y
@@ -355,6 +357,7 @@
 ##
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_P4_CLOCKMOD=m