X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.config.old;h=8db28ce90bc1c45d90f215d2bd7f6252160ab0ee;hb=c469b50b11a8eaa1dc314687c2b6030c8fdea5b7;hp=e5440ae00c060ddb0cbbb707388d8158d2a9a2ac;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/.config.old b/.config.old
index e5440ae00..8db28ce90 100644
--- a/.config.old
+++ b/.config.old
@@ -1591,7 +1591,7 @@ CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 
-CONFIG_W1=m
+# CONFIG_W1 is not set
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_SLAVE_THERM=m
@@ -2868,6 +2868,9 @@ CONFIG_CACHEFILES_DEBUG=y
 CONFIG_NFS_FSCACHE=y
 
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+
+CONFIG_HZ_1000=y
+
 CONFIG_UID16=y
 # CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
@@ -2880,7 +2883,7 @@ CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=255
+CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set