X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-ppc-smp.config;h=1e88dacdcd1b0e90e43bb2121d0c1122d95dfd36;hb=7172c64a7cee4dfa95864f49c914f7ea8cf497c8;hp=66147ea3ded3aae5fa31c4ef70691dd4ada7e8f4;hpb=3967a72a825e44bff5d10f516e90b6f59f59e599;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-ppc-smp.config b/configs/kernel-2.6.18-ppc-smp.config
index 66147ea3d..1e88dacdc 100644
--- a/configs/kernel-2.6.18-ppc-smp.config
+++ b/configs/kernel-2.6.18-ppc-smp.config
@@ -1,8 +1,8 @@
 # powerpc
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.2-rc1
-# Mon Nov 13 09:44:41 2006
+# Linux kernel version: 2.6.18.2
+# Mon Nov 13 09:31:59 2006
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -176,9 +176,9 @@ CONFIG_MPIC=y
 #
 CONFIG_HIGHMEM=y
 # CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -1993,23 +1993,7 @@ CONFIG_SENSORS_MAX6875=m
 #
 # Dallas's 1-wire bus
 #
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support