X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-i686-smp.config;h=224e29a3c23449767e8df9b10f2528f5428e90b8;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=52cad34232703a3d3eca5e4d9ad3e4391ada0de6;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-i686-smp.config b/configs/kernel-2.6.18-i686-smp.config
index 52cad3423..224e29a3c 100644
--- a/configs/kernel-2.6.18-i686-smp.config
+++ b/configs/kernel-2.6.18-i686-smp.config
@@ -1,8 +1,8 @@
 # i386
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.2
-# Mon Nov 13 09:31:58 2006
+# Linux kernel version: 2.6.18.5
+# Wed Dec 13 17:11:31 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -78,12 +78,6 @@ CONFIG_MODULE_SIG=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -167,7 +161,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_BKL=y
 CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_APIC_AUTO=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set