X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-x86_64.config;fp=configs%2Fkernel-2.6.18-x86_64.config;h=8ff43766850e3c3547d8b872a099d473f0025b2f;hb=c469b50b11a8eaa1dc314687c2b6030c8fdea5b7;hp=a6e596316444e828cfa2eb3c8141915afa2b32b6;hpb=67da514125f23d27bd45d41e330ef14b6206fe69;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-x86_64.config b/configs/kernel-2.6.18-x86_64.config
index a6e596316..8ff437668 100644
--- a/configs/kernel-2.6.18-x86_64.config
+++ b/configs/kernel-2.6.18-x86_64.config
@@ -1,8 +1,8 @@
 # x86_64
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.5
-# Wed Dec 13 17:11:37 2006
+# Linux kernel version: 2.6.18.6-rc2
+# Tue Dec 26 19:31:33 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -156,7 +156,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_NR_CPUS=255
+CONFIG_NR_CPUS=64
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
@@ -2885,10 +2885,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