[kernel] r17818 - in dists/trunk/linux-2.6/debian/config: . armel kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Tue Jul  5 13:00:48 2011
New Revision: 17818

Log:
update configs to 3.0-rc6

no big surprises, small shuffling

Modified:
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x
   dists/trunk/linux-2.6/debian/config/armel/config.versatile
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Tue Jul  5 13:00:48 2011	(r17818)
@@ -712,4 +712,3 @@
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
-

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Tue Jul  5 13:00:48 2011	(r17818)
@@ -585,4 +585,3 @@
 ##
 CONFIG_WAN_ROUTER=m
 
-

Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile	Tue Jul  5 13:00:48 2011	(r17818)
@@ -437,4 +437,3 @@
 ##
 # CONFIG_WAN_ROUTER is not set
 
-

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Jul  5 13:00:48 2011	(r17818)
@@ -460,12 +460,11 @@
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87427=m
-CONFIG_SMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
@@ -4536,4 +4535,5 @@
 CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
 CONFIG_CGROUP_NS=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
+CONFIG_SMBUS=m
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jul  5 13:00:48 2011	(r17818)
@@ -435,7 +435,6 @@
 ##
 ## file: drivers/hwmon/Kconfig
 ##
-CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -469,6 +468,7 @@
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_ACPI_POWER=m
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -1087,14 +1087,14 @@
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
 CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
 CONFIG_COMEDI_USB_DRIVERS=m
 CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIO=m
 CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_FC=m
 
 ##
 ## file: drivers/staging/easycap/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jul  5 12:53:17 2011	(r17817)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jul  5 13:00:48 2011	(r17818)
@@ -144,10 +144,10 @@
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
+CONFIG_I2C_PXA=m
 CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
-CONFIG_I2C_PXA=m
 
 ##
 ## file: drivers/ide/Kconfig