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

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

diff --git a/configs/kernel-2.6.18-i586-smp.config b/configs/kernel-2.6.18-i586-smp.config
index 74a7737..7031af6 100644 (file)
--- a/configs/kernel-2.6.18-i586-smp.config
+++ b/configs/kernel-2.6.18-i586-smp.config
@@ -1,8 +1,8 @@
 # i386
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.5
-# Wed Dec 13 17:11:30 2006
+# Linux kernel version: 2.6.18.6-rc2
+# Tue Dec 26 19:31:26 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -3097,10 +3097,6 @@ 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