X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-i686-xen.config;h=7fb1817e1a510068826c1e5fefc838ec2cccedf3;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=d01024b4376d57fab018b51bb17a56a09dede203;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-i686-xen.config b/configs/kernel-2.6.18-i686-xen.config
index d01024b43..7fb1817e1 100644
--- a/configs/kernel-2.6.18-i686-xen.config
+++ b/configs/kernel-2.6.18-i686-xen.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:32 2006
 #
 CONFIG_X86_32=y
 CONFIG_LOCKDEP_SUPPORT=y
@@ -77,12 +77,6 @@ CONFIG_MODULE_SIG=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -160,7 +154,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_VM86=y
 CONFIG_TOSHIBA=m