[kernel] r8893 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm i386 ia64 mips mipsel powerpc

[Maximilian Attems]

Author: maks
Date: Mon Jun  4 13:06:22 2007
New Revision: 8893

Log:
* topconfig group w1 bus master variables
* kick any other w1 definition, most of them outdated
  enabled anyway due to topconfig


Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/arch/powerpc/config

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Mon Jun  4 13:06:22 2007
@@ -961,12 +961,6 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_W1=m
-CONFIG_W1_MATROX=m
-CONFIG_W1_DS9490=m
-CONFIG_W1_DS9490_BRIDGE=m
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Mon Jun  4 13:06:22 2007
@@ -898,7 +898,6 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_W1=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
 CONFIG_VIDEO_DEV=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Mon Jun  4 13:06:22 2007
@@ -1092,26 +1092,6 @@
 #
 
 #
-# Dallas's 1-wire bus
-#
-CONFIG_W1=m
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS9490=m
-CONFIG_W1_MASTER_DS9490_BRIDGE=m
-CONFIG_W1_MASTER_DS2482=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2433=m
-
-#
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Mon Jun  4 13:06:22 2007
@@ -740,6 +740,13 @@
 # CONFIG_SPI_SPIDEV is not set
 
 #
+# 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
@@ -1374,7 +1381,6 @@
 CONFIG_GIGASET_BASE=m
 CONFIG_NEW_LEDS=y
 CONFIG_SND_RIPTIDE=m
-CONFIG_W1_MASTER_MATROX=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_USB_ZC0301=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
@@ -1389,7 +1395,6 @@
 CONFIG_IP_DCCP_CCID2=m
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
-CONFIG_W1_MASTER_DS2482=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_SND_ALS300=m
@@ -1429,7 +1434,6 @@
 CONFIG_SND_GINA20=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SND_GINA24=m
-CONFIG_W1_MASTER_DS2490=m
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_SND_DARLA20=m
 CONFIG_SND_DARLA24=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Mon Jun  4 13:06:22 2007
@@ -1090,7 +1090,6 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_W1=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
 CONFIG_RADIO_CADET=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Mon Jun  4 13:06:22 2007
@@ -317,12 +317,6 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_W1=m
-CONFIG_W1_MATROX=m
-CONFIG_W1_DS9490=m
-CONFIG_W1_DS9490_BRIDGE=m
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta	Mon Jun  4 13:06:22 2007
@@ -1900,27 +1900,6 @@
 #
 
 #
-# 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 is not set
-
-#
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta	Mon Jun  4 13:06:22 2007
@@ -1900,27 +1900,6 @@
 #
 
 #
-# 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 is not set
-
-#
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Mon Jun  4 13:06:22 2007
@@ -718,12 +718,6 @@
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_W1=m
-CONFIG_W1_MATROX=m
-CONFIG_W1_DS9490=m
-CONFIG_W1_DS9490_BRIDGE=m
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_CPIA=m