Merge to Fedora kernel-2.6.17-1.2187_FC5-vs2.0.2.1 patched with stable patch-2.6...

[linux-2.6.git] / configs / kernel-2.6.17-i686-planetlab.config

diff --git a/configs/kernel-2.6.17-i686-planetlab.config b/configs/kernel-2.6.17-i686-planetlab.config
index 3d0b18a..2acdd7a 100644 (file)
--- a/configs/kernel-2.6.17-i686-planetlab.config
+++ b/configs/kernel-2.6.17-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-1.2142_FC4-1.planetlab
-# Mon Aug 21 16:39:45 2006
+# Linux kernel version: 2.6.17-1.2142_FC4.3
+# Wed Oct 18 22:35:27 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -93,6 +93,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 #
 # CONFIG_SMP is not set
 CONFIG_X86_PC=y
+# CONFIG_X86_XEN is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
@@ -156,6 +157,7 @@ CONFIG_X86_MCE_P4THERMAL=y
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
+# CONFIG_SWIOTLB is not set
 
 #
 # Firmware Drivers
@@ -194,6 +196,7 @@ CONFIG_HZ=1000
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x100000
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management options (ACPI, APM)
@@ -243,6 +246,7 @@ CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOXEN_FE is not set
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
@@ -887,7 +891,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_BCM5700=m
+# CONFIG_BCM5700 is not set
 
 #
 # Ethernet (10000 Mbit)