[kernel] r14486 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 armel hppa i386 ia64 kernelarch-x86 mips mipsel powerpc s390 sparc

Bastian Blank waldi at alioth.debian.org
Thu Oct 29 09:31:49 UTC 2009 

Author: waldi
Date: Thu Oct 29 09:31:47 2009
New Revision: 14486

Log:
debian/config: Reorder.

Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
   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/hppa/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/s390/config
   dists/trunk/linux-2.6/debian/config/sparc/config
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -216,8 +216,6 @@
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
@@ -278,11 +276,6 @@
 CONFIG_SCx200_ACB=m
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
@@ -536,7 +529,6 @@
 CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_USB_DSBR=m
 
@@ -1056,7 +1048,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1337,5 +1328,10 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -207,8 +207,6 @@
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
@@ -269,11 +267,6 @@
 CONFIG_SCx200_ACB=m
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
@@ -1016,7 +1009,6 @@
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -1286,5 +1278,9 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Thu Oct 29 09:31:47 2009	(r14486)
@@ -29,7 +29,6 @@
 # CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
-# CONFIG_PREEMPT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
@@ -145,6 +144,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -155,8 +155,6 @@
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
 CONFIG_SENSORS_F75375S=y
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -182,7 +180,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -217,12 +214,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
@@ -707,6 +698,13 @@
 # CONFIG_PM is not set
 
 ##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
 ## file: kernel/trace/Kconfig
 ##
 #. disabled because of size restrictions
@@ -889,5 +887,9 @@
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_NO_IDLE_HZ is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Thu Oct 29 09:31:47 2009	(r14486)
@@ -29,7 +29,6 @@
 # CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
-# CONFIG_PREEMPT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,115200"
@@ -189,6 +188,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -198,8 +198,6 @@
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -225,7 +223,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -262,12 +259,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 # CONFIG_IDE is not set
@@ -786,6 +777,13 @@
 # CONFIG_PM is not set
 
 ##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
 ## file: kernel/trace/Kconfig
 ##
 #. disabled because of size restrictions
@@ -959,5 +957,9 @@
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_NO_IDLE_HZ is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8574=m
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile	Thu Oct 29 09:31:47 2009	(r14486)
@@ -34,7 +34,6 @@
 # CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
-# CONFIG_PREEMPT is not set
 # CONFIG_LEDS is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
@@ -445,6 +444,13 @@
 # CONFIG_PM is not set
 
 ##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
 ## file: kernel/time/Kconfig
 ##
 # CONFIG_NO_HZ is not set

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -321,7 +321,6 @@
 ##
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
 CONFIG_HIDRAW=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_LOGITECH_FF=y
@@ -342,6 +341,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
@@ -353,7 +353,6 @@
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ATK0110=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71882FG=m
@@ -383,9 +382,9 @@
 CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_APPLESMC=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -407,8 +406,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_DS1682=m
-CONFIG_PCF8575=m
-CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_TSL2550=m
 
 ##
@@ -855,11 +852,15 @@
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_USB_SI470X=m
 CONFIG_USB_MR800=m
 CONFIG_RADIO_TEA5764=m
 
 ##
+## file: drivers/media/radio/si470x/Kconfig
+##
+CONFIG_USB_SI470X=m
+
+##
 ## file: drivers/media/video/Kconfig
 ##
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
@@ -1994,11 +1995,6 @@
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 
 ##
-## file: drivers/staging/agnx/Kconfig
-##
-# CONFIG_AGNX is not set
-
-##
 ## file: drivers/staging/altpciechdma/Kconfig
 ##
 # CONFIG_ALTERA_PCIE_CHDMA is not set
@@ -2018,11 +2014,6 @@
 # CONFIG_ASUS_OLED is not set
 
 ##
-## file: drivers/staging/at76_usb/Kconfig
-##
-# CONFIG_USB_ATMEL is not set
-
-##
 ## file: drivers/staging/b3dfg/Kconfig
 ##
 # CONFIG_B3DFG is not set
@@ -2033,11 +2024,6 @@
 # CONFIG_COMEDI is not set
 
 ##
-## file: drivers/staging/cpc-usb/Kconfig
-##
-# CONFIG_USB_CPC is not set
-
-##
 ## file: drivers/staging/dst/Kconfig
 ##
 # CONFIG_DST is not set
@@ -2048,11 +2034,6 @@
 # CONFIG_ECHO is not set
 
 ##
-## file: drivers/staging/epl/Kconfig
-##
-# CONFIG_EPL is not set
-
-##
 ## file: drivers/staging/et131x/Kconfig
 ##
 # CONFIG_ET131X is not set
@@ -2068,26 +2049,11 @@
 # CONFIG_VIDEO_GO7007 is not set
 
 ##
-## file: drivers/staging/heci/Kconfig
-##
-# CONFIG_HECI is not set
-
-##
 ## file: drivers/staging/line6/Kconfig
 ##
 # CONFIG_LINE6_USB is not set
 
 ##
-## file: drivers/staging/me4000/Kconfig
-##
-# CONFIG_ME4000 is not set
-
-##
-## file: drivers/staging/meilhaus/Kconfig
-##
-# CONFIG_MEILHAUS is not set
-
-##
 ## file: drivers/staging/mimio/Kconfig
 ##
 # CONFIG_INPUT_MIMIO is not set
@@ -2108,11 +2074,6 @@
 # CONFIG_PANEL is not set
 
 ##
-## file: drivers/staging/pata_rdc/Kconfig
-##
-# CONFIG_RDC_17F3101X is not set
-
-##
 ## file: drivers/staging/phison/Kconfig
 ##
 # CONFIG_IDE_PHISON is not set
@@ -2138,11 +2099,6 @@
 # CONFIG_RT2870 is not set
 
 ##
-## file: drivers/staging/rt3070/Kconfig
-##
-# CONFIG_RT3070 is not set
-
-##
 ## file: drivers/staging/rtl8187se/Kconfig
 ##
 # CONFIG_RTL8187SE is not set
@@ -2182,11 +2138,6 @@
 # CONFIG_STLC45XX is not set
 
 ##
-## file: drivers/staging/sxg/Kconfig
-##
-# CONFIG_SXG is not set
-
-##
 ## file: drivers/staging/udlfb/Kconfig
 ##
 # CONFIG_FB_UDL is not set
@@ -2626,7 +2577,6 @@
 ## file: fs/ext4/Kconfig
 ##
 CONFIG_EXT4_FS=m
-CONFIG_EXT4DEV_COMPAT=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
@@ -2964,9 +2914,7 @@
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 ## choice: RCU Implementation
-CONFIG_CLASSIC_RCU=y
 # CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
 ## end choice
 # CONFIG_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
@@ -3011,7 +2959,6 @@
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
 CONFIG_SLAB=y
@@ -3019,7 +2966,6 @@
 # CONFIG_SLOB is not set
 ## end choice
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -3101,6 +3047,7 @@
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -3421,7 +3368,6 @@
 ## file: net/mac80211/Kconfig
 ##
 CONFIG_MAC80211=m
-CONFIG_MAC80211_DEFAULT_PS=y
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
 ## choice: Default rate control algorithm
@@ -3843,16 +3789,34 @@
 ##
 ## file: unknown
 ##
+# CONFIG_AGNX is not set
+CONFIG_CLASSIC_RCU=y
 CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_EPL is not set
 # CONFIG_EVENT_TRACER is not set
+CONFIG_EXT4DEV_COMPAT=y
 # CONFIG_GIGASET_UNDOCREQ is not set
+# CONFIG_HECI is not set
+# CONFIG_HID_DEBUG is not set
 CONFIG_IWLWIFI_RFKILL=y
 # CONFIG_KPROBES is not set
 CONFIG_LBD=y
 CONFIG_LEDS_LP5521=m
+CONFIG_MAC80211_DEFAULT_PS=y
+# CONFIG_MARKERS is not set
+# CONFIG_ME4000 is not set
+# CONFIG_MEILHAUS is not set
+CONFIG_PCF8575=m
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RDC_17F3101X is not set
+# CONFIG_RT3070 is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+# CONFIG_SXG is not set
 CONFIG_UNEVICTABLE_LRU=y
+# CONFIG_USB_ATMEL is not set
+# CONFIG_USB_CPC is not set
 

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -171,7 +171,6 @@
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MOUSE_HIL=m
 
 ##
 ## file: drivers/input/serio/Kconfig
@@ -814,3 +813,8 @@
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+CONFIG_MOUSE_HIL=m
+

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -230,8 +230,6 @@
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
@@ -294,11 +292,6 @@
 CONFIG_SCx200_ACB=m
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
@@ -582,7 +575,6 @@
 CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_USB_DSBR=m
 
@@ -1197,7 +1189,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -1518,5 +1509,10 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -160,8 +160,6 @@
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
@@ -221,11 +219,6 @@
 CONFIG_SCx200_ACB=m
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
@@ -740,7 +733,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -910,3 +902,11 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_PCF8574=m
+

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -100,7 +100,6 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
-# CONFIG_KVM_TRACE is not set
 
 ##
 ## file: arch/x86/xen/Kconfig
@@ -242,11 +241,6 @@
 CONFIG_RT2870=m
 
 ##
-## file: drivers/staging/rt3070/Kconfig
-##
-CONFIG_RT3070=m
-
-##
 ## file: drivers/staging/rtl8187se/Kconfig
 ##
 CONFIG_RTL8187SE=m
@@ -290,6 +284,8 @@
 ## file: unknown
 ##
 CONFIG_DMAR_GFX_WA=y
+# CONFIG_KVM_TRACE is not set
 CONFIG_NUMA_MIGRATE_IRQ_DESC=y
+CONFIG_RT3070=m
 CONFIG_THINKPAD_ACPI_BAY=y
 

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	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Oct 29 09:31:47 2009	(r14486)
@@ -7,8 +7,6 @@
 CONFIG_X86_BIGSMP=y
 CONFIG_VMI=y
 CONFIG_NR_CPUS=32
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set
@@ -98,3 +96,9 @@
 ##
 CONFIG_LSM_MMAP_MIN_ADDR=0
 
+##
+## file: unknown
+##
+CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
+

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Oct 29 09:31:47 2009	(r14486)
@@ -46,9 +46,7 @@
 ## file: init/Kconfig
 ##
 ## choice: RCU Implementation
-# CONFIG_CLASSIC_RCU is not set
 CONFIG_TREE_RCU=y
-# CONFIG_PREEMPT_RCU is not set
 ## end choice
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -72,3 +70,9 @@
 ##
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
+##
+## file: unknown
+##
+# CONFIG_CLASSIC_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Thu Oct 29 09:31:47 2009	(r14486)
@@ -279,6 +279,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
@@ -289,8 +290,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 CONFIG_SENSORS_DS1621=m
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -323,7 +322,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -359,12 +357,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -1295,7 +1287,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1654,10 +1645,15 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_GIGASET_UNDOCREQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Thu Oct 29 09:31:47 2009	(r14486)
@@ -259,7 +259,6 @@
 ## file: drivers/hid/Kconfig
 ##
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 
 ##
 ## file: drivers/hid/usbhid/Kconfig
@@ -272,6 +271,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADM1021=m
@@ -284,8 +284,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 CONFIG_SENSORS_DS1621=m
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -319,7 +317,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -356,12 +353,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -1562,7 +1553,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -1955,10 +1945,16 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_GIGASET_UNDOCREQ is not set
+# CONFIG_HID_DEBUG is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Thu Oct 29 09:31:47 2009	(r14486)
@@ -146,6 +146,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -155,8 +156,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -180,7 +179,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -202,12 +200,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 # CONFIG_IDE is not set
@@ -625,5 +617,9 @@
 ##
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Thu Oct 29 09:31:47 2009	(r14486)
@@ -157,6 +157,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -166,8 +167,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -194,7 +193,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -230,12 +228,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 # CONFIG_IDE is not set
@@ -783,5 +775,9 @@
 CONFIG_INPUT_SGIO2_BTNS=m
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Thu Oct 29 09:31:47 2009	(r14486)
@@ -202,6 +202,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -211,8 +212,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -239,7 +238,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -276,12 +274,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 # CONFIG_IDE is not set
@@ -748,7 +740,6 @@
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MULTIHEAD is not set
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1011,10 +1002,15 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
+# CONFIG_FB_MATROX_MULTIHEAD is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Thu Oct 29 09:31:47 2009	(r14486)
@@ -203,6 +203,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -212,8 +213,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -240,7 +239,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -277,12 +275,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -778,7 +770,6 @@
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MULTIHEAD is not set
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1040,10 +1031,15 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
+# CONFIG_FB_MATROX_MULTIHEAD is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Thu Oct 29 09:31:47 2009	(r14486)
@@ -278,6 +278,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
@@ -288,8 +289,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 CONFIG_SENSORS_DS1621=m
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -322,7 +321,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -358,12 +356,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -1294,7 +1286,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1636,10 +1627,15 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_GIGASET_UNDOCREQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Thu Oct 29 09:31:47 2009	(r14486)
@@ -258,7 +258,6 @@
 ## file: drivers/hid/Kconfig
 ##
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 
 ##
 ## file: drivers/hid/usbhid/Kconfig
@@ -271,6 +270,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADM1021=m
@@ -283,8 +283,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 CONFIG_SENSORS_DS1621=m
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -318,7 +316,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -355,12 +352,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -1562,7 +1553,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -1950,10 +1940,16 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_GIGASET_UNDOCREQ is not set
+# CONFIG_HID_DEBUG is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Thu Oct 29 09:31:47 2009	(r14486)
@@ -202,6 +202,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -211,8 +212,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -239,7 +238,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -276,12 +274,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 # CONFIG_IDE is not set
@@ -748,7 +740,6 @@
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MULTIHEAD is not set
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1011,10 +1002,15 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
+# CONFIG_FB_MATROX_MULTIHEAD is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Thu Oct 29 09:31:47 2009	(r14486)
@@ -202,6 +202,7 @@
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -211,8 +212,6 @@
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -239,7 +238,6 @@
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -276,12 +274,6 @@
 # CONFIG_SCx200_ACB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -777,7 +769,6 @@
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MULTIHEAD is not set
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1039,10 +1030,15 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
+# CONFIG_FB_MATROX_MULTIHEAD is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -199,8 +199,6 @@
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
@@ -261,11 +259,6 @@
 CONFIG_SCx200_ACB=m
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-CONFIG_SENSORS_PCF8574=m
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -821,7 +814,6 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1074,5 +1066,9 @@
 ##
 ## file: unknown
 ##
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_PCF8574=m
 CONFIG_WDT_501_PCI=y
 

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -20,8 +20,6 @@
 CONFIG_CMM=y
 CONFIG_CMM_PROC=y
 CONFIG_CMM_IUCV=y
-#. unsure
-# CONFIG_PAGE_STATES is not set
 CONFIG_APPLDATA_BASE=y
 CONFIG_APPLDATA_MEM=m
 CONFIG_APPLDATA_OS=m
@@ -238,6 +236,7 @@
 ## file: unknown
 ##
 CONFIG_MACHCHK_WARNING=y
+# CONFIG_PAGE_STATES is not set
 # CONFIG_QDIO_DEBUG is not set
 CONFIG_VIRT_TIMER=y
 

Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/sparc/config	Thu Oct 29 09:31:47 2009	(r14486)
@@ -211,7 +211,6 @@
 ##
 ## file: drivers/video/console/Kconfig
 ##
-# CONFIG_PROM_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_SUN8x16=y
@@ -390,3 +389,8 @@
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
 
+##
+## file: unknown
+##
+# CONFIG_PROM_CONSOLE is not set
+

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Thu Oct 29 09:31:47 2009	(r14486)
@@ -47,8 +47,6 @@
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -106,11 +104,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -404,3 +397,10 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
+##
+## file: unknown
+##
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_PCF8574 is not set
+

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Wed Oct 28 06:03:58 2009	(r14485)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Thu Oct 29 09:31:47 2009	(r14486)
@@ -49,8 +49,6 @@
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
@@ -108,11 +106,6 @@
 # CONFIG_I2C_STUB is not set
 
 ##
-## file: drivers/i2c/chips/Kconfig
-##
-# CONFIG_SENSORS_PCF8574 is not set
-
-##
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
@@ -406,3 +399,10 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
+##
+## file: unknown
+##
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_PCF8574 is not set
+

More information about the Kernel-svn-changes mailing list