X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=.config.old;h=90ead9a078e9f1a3c995d097fb2287bf3a7928e3;hb=7172c64a7cee4dfa95864f49c914f7ea8cf497c8;hp=e5440ae00c060ddb0cbbb707388d8158d2a9a2ac;hpb=3967a72a825e44bff5d10f516e90b6f59f59e599;p=linux-2.6.git

diff --git a/.config.old b/.config.old
index e5440ae00..90ead9a07 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