X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-i586.config;h=96022d6a5f3cb9d3e0f2ce7b565cf8108000594a;hb=a030541d6dd71712d1989c26d9e63a698c64d5d8;hp=f47689d5674f499653e7caa78e66c1005e420cea;hpb=7172c64a7cee4dfa95864f49c914f7ea8cf497c8;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-i586.config b/configs/kernel-2.6.18-i586.config
index f47689d56..96022d6a5 100644
--- a/configs/kernel-2.6.18-i586.config
+++ b/configs/kernel-2.6.18-i586.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:57 2006
+# Linux kernel version: 2.6.18.6
+# Thu Dec 28 22:01:21 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -76,12 +76,6 @@ CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_KMOD=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -1903,7 +1897,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
@@ -2019,7 +2013,7 @@ CONFIG_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
+CONFIG_SONYPI=m
 
 #
 # Ftape, the floppy tape device driver
@@ -2234,6 +2228,7 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m