Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / configs / kernel-2.6.18-i686-smp.config

diff --git a/configs/kernel-2.6.18-i686-smp.config b/configs/kernel-2.6.18-i686-smp.config
index b2c4078..002f396 100644 (file)
--- 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.6-rc2
-# Tue Dec 26 19:31:27 2006
+# Linux kernel version: 2.6.18.6
+# Thu Dec 28 22:01:22 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -1922,7 +1922,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
@@ -3131,6 +3131,10 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_VXFS_FS=m
 # CONFIG_HPFS_FS is not set
 CONFIG_QNX4FS_FS=m