X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-x86_64-xen0.config;h=51a5b78dd97e33c41ce5ed8af1e7baa4d839e8e2;hb=a030541d6dd71712d1989c26d9e63a698c64d5d8;hp=25d6f9044f676953ffc3b27bc8d67525bf7a5d05;hpb=f05f9504c50ed069377d37f02f22e7a16b5921de;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-x86_64-xen0.config b/configs/kernel-2.6.18-x86_64-xen0.config
index 25d6f9044..51a5b78dd 100644
--- a/configs/kernel-2.6.18-x86_64-xen0.config
+++ b/configs/kernel-2.6.18-x86_64-xen0.config
@@ -1,8 +1,8 @@
 # x86_64
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.2-rc1
-# Mon Nov 13 09:44:43 2006
+# Linux kernel version: 2.6.18.6
+# Thu Dec 28 22:01:27 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -82,12 +82,6 @@ CONFIG_MODULE_SIG=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -1723,7 +1717,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_COMPUTONE is not set
-# CONFIG_ROCKETPORT is not set
+CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
 # CONFIG_DIGIEPCA is not set
@@ -1935,23 +1929,7 @@ CONFIG_SENSORS_MAX6875=m
 #
 # Dallas's 1-wire bus
 #
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -3107,8 +3085,8 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_FRAMEBUFFER=y
-CONFIG_XEN_KEYBOARD=y
+# CONFIG_XEN_FRAMEBUFFER is not set
+# CONFIG_XEN_KEYBOARD is not set
 CONFIG_XEN_SCRUB_PAGES=y
 # CONFIG_XEN_DISABLE_SERIAL is not set
 CONFIG_XEN_SYSFS=y