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

Bastian Blank waldi at alioth.debian.org
Wed May 20 13:20:21 UTC 2009 

Author: waldi
Date: Wed May 20 13:20:19 2009
New Revision: 13641

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/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/arm/config.iop32x
   dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/arm/config.orion5x
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   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/i386/config.686-bigmem
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/m68k/config.amiga
   dists/trunk/linux-2.6/debian/config/m68k/config.atari
   dists/trunk/linux-2.6/debian/config/m68k/config.mac
   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.r5k-cobalt
   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/powerpc/config.powerpc-smp
   dists/trunk/linux-2.6/debian/config/s390/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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Wed May 20 13:20:19 2009	(r13641)
@@ -233,6 +233,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -280,7 +281,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -315,7 +315,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_4DRIVES=y
 CONFIG_BLK_DEV_ALI14XX=m
 CONFIG_BLK_DEV_DTC2278=m
@@ -844,11 +843,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
@@ -862,6 +856,15 @@
 # CONFIG_IPW2100 is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 # CONFIG_PCI_DEBUG is not set
@@ -1024,8 +1027,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_TEST=m
 
@@ -1091,7 +1092,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
 CONFIG_FB_VIRTUAL=m
 
 ##
@@ -1123,7 +1123,6 @@
 CONFIG_PCWATCHDOG=m
 CONFIG_MIXCOMWD=m
 CONFIG_WDT=m
-CONFIG_WDT_501=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
@@ -1293,7 +1292,6 @@
 CONFIG_SND_AZT2320=m
 CONFIG_SND_CMI8330=m
 CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
 CONFIG_SND_CS4236=m
 CONFIG_SND_DT019X=m
 CONFIG_SND_ES968=m
@@ -1398,3 +1396,13 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
+##
+## file: unknown
+##
+CONFIG_FB_TRIDENT_ACCEL=y
+# CONFIG_IDE_ARM is not set
+CONFIG_SND_CS4232=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_WDT_501=y
+

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 13:20:19 2009	(r13641)
@@ -11,10 +11,7 @@
 CONFIG_SPARSE_IRQ=y
 CONFIG_NUMA_MIGRATE_IRQ_DESC=y
 CONFIG_X86_MPPARSE=y
-## choice: Subarchitecture Type
-CONFIG_X86_PC=y
 # CONFIG_X86_VSMP is not set
-## end choice
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -63,7 +60,6 @@
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_DMAR_GFX_WA=y
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_INTR_REMAP=y
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=y
@@ -84,7 +80,6 @@
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
@@ -105,7 +100,6 @@
 ##
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 # CONFIG_X86_P4_CLOCKMOD is not set
 
@@ -350,8 +344,6 @@
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82875P=m
@@ -359,6 +351,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_I5000=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 ##
 ## file: drivers/firmware/Kconfig
@@ -423,6 +417,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -470,7 +465,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -512,7 +506,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -731,7 +724,6 @@
 CONFIG_PHANTOM=m
 CONFIG_HP_ILO=m
 CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
 
 ##
 ## file: drivers/mmc/Kconfig
@@ -978,11 +970,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
@@ -996,6 +983,15 @@
 # CONFIG_IPW2100 is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_PCI_MSI=y
@@ -1041,6 +1037,7 @@
 ##
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+CONFIG_DELL_WMI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -1208,8 +1205,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_TEST=m
 
@@ -1287,7 +1282,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
 CONFIG_XEN_FBDEV_FRONTEND=y
 
@@ -1383,8 +1377,8 @@
 ## file: init/Kconfig
 ##
 ## choice: RCU Implementation
-CONFIG_TREE_RCU=y
 # CONFIG_CLASSIC_RCU is not set
+CONFIG_TREE_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 ## end choice
 CONFIG_RCU_FANOUT=64
@@ -1418,6 +1412,11 @@
 CONFIG_SPARSEMEM_VMEMMAP=y
 
 ##
+## file: mm/Kconfig.debug
+##
+# CONFIG_DEBUG_PAGEALLOC is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 CONFIG_ATM=m
@@ -1607,3 +1606,13 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
+##
+## file: unknown
+##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_X86_PC=y
+CONFIG_X86_POWERNOW_K8_ACPI=y
+

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 20 13:20:19 2009	(r13641)
@@ -241,6 +241,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -290,7 +291,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 CONFIG_SENSORS_PCA9539=m
-# CONFIG_SENSORS_PCF8591 is not set
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -328,7 +328,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
@@ -735,11 +734,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
@@ -748,6 +742,15 @@
 # CONFIG_USB_ZD1201 is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 # CONFIG_PCI_DEBUG is not set
@@ -933,8 +936,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_LD=m
 # CONFIG_USB_TEST is not set
@@ -1010,7 +1011,6 @@
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
-CONFIG_FB_CYBLA=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -1372,7 +1372,6 @@
 # CONFIG_SND_AZT2320 is not set
 # CONFIG_SND_CMI8330 is not set
 # CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
 # CONFIG_SND_CS4236 is not set
 # CONFIG_SND_DT019X is not set
 # CONFIG_SND_ES968 is not set
@@ -1471,5 +1470,10 @@
 ##
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_IDE_ARM is not set
 # CONFIG_NO_IDLE_HZ is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Wed May 20 13:20:19 2009	(r13641)
@@ -45,6 +45,8 @@
 ##
 ## file: arch/arm/Kconfig.debug
 ##
+#. disabled because of size restrictions
+# CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
 
 ##
@@ -62,11 +64,6 @@
 CONFIG_ARM_THUMB=y
 
 ##
-## file: block/Kconfig
-##
-# CONFIG_BLK_DEV_IO_TRACE is not set
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
@@ -179,6 +176,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -227,7 +225,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 
 ##
@@ -263,7 +260,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -356,7 +352,6 @@
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -536,11 +531,6 @@
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WLAN_80211=y
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 
@@ -555,6 +545,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 # CONFIG_PCCARD is not set
@@ -723,6 +722,21 @@
 ##
 # CONFIG_PM is not set
 
+##
+## file: kernel/trace/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BOOT_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+##
+## file: lib/Kconfig.debug
+##
+#. disabled because of size restrictions
+# CONFIG_DEBUG_KERNEL is not set
 
 ##
 ## file: mm/Kconfig
@@ -806,6 +820,12 @@
 # CONFIG_X25 is not set
 
 ##
+## file: security/selinux/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_SECURITY_SELINUX is not set
+
+##
 ## file: sound/core/Kconfig
 ##
 CONFIG_SND_SEQUENCER=m
@@ -885,18 +905,7 @@
 ##
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_MD_RAID5_RESHAPE=y
 # CONFIG_NO_IDLE_HZ is not set
 
-#. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-#. disabled because of size restrictions
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_DEBUG_KERNEL is not set
-#. disabled because of size restrictions
-# CONFIG_ARM_UNWIND is not set
-#. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-

Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Wed May 20 13:20:19 2009	(r13641)
@@ -45,6 +45,8 @@
 ##
 ## file: arch/arm/Kconfig.debug
 ##
+#. disabled because of size restrictions
+# CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
 
 ##
@@ -217,6 +219,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 # CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PCF8591=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -267,7 +270,6 @@
 ##
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -542,11 +544,6 @@
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WLAN_80211=y
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 # CONFIG_PCI_ATMEL is not set
 
@@ -568,6 +565,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 # CONFIG_PCCARD is not set
@@ -793,6 +799,22 @@
 # CONFIG_PM is not set
 
 ##
+## file: kernel/trace/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BOOT_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+##
+## file: lib/Kconfig.debug
+##
+#. disabled because of size restrictions
+# CONFIG_DEBUG_KERNEL is not set
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
@@ -869,6 +891,12 @@
 CONFIG_X25=m
 
 ##
+## file: security/selinux/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_SECURITY_SELINUX is not set
+
+##
 ## file: sound/core/Kconfig
 ##
 CONFIG_SND_SEQUENCER=m
@@ -946,16 +974,3 @@
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_NO_IDLE_HZ is not set
 
-#. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-#. disabled because of size restrictions
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_DEBUG_KERNEL is not set
-#. disabled because of size restrictions
-# CONFIG_ARM_UNWIND is not set
-#. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-

Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Wed May 20 13:20:19 2009	(r13641)
@@ -38,6 +38,7 @@
 CONFIG_PCI=y
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
@@ -77,9 +78,9 @@
 CONFIG_ATA=m
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
 CONFIG_SATA_MV=m
 # CONFIG_SATA_NV is not set
 # CONFIG_PDC_ADMA is not set
@@ -568,6 +569,16 @@
 CONFIG_HIGH_RES_TIMERS=y
 
 ##
+## file: kernel/trace/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BOOT_TRACER is not set
+#. disabled because of size restrictions
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
@@ -601,20 +612,15 @@
 CONFIG_X25=m
 
 ##
+## file: security/selinux/Kconfig
+##
+#. disabled because of size restrictions
+# CONFIG_SECURITY_SELINUX is not set
+
+##
 ## file: unknown
 ##
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_MSM7X00A is not set
 
-CONFIG_UACCESS_WITH_MEMCPY=y
-
-##. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-##. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-##. disabled because of size restrictions
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-##. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed May 20 13:20:19 2009	(r13641)
@@ -39,6 +39,7 @@
 CONFIG_PCI=y
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
@@ -59,12 +60,10 @@
 CONFIG_MACH_RD88F6281=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_TS219=y
-CONFIG_PLAT_ORION=y
 
 ##
 ## file: arch/arm/mm/Kconfig
 ##
-#CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
@@ -76,9 +75,9 @@
 CONFIG_ATA=m
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
 CONFIG_SATA_MV=m
 # CONFIG_SATA_NV is not set
 # CONFIG_PDC_ADMA is not set
@@ -142,6 +141,11 @@
 CONFIG_BT_HCIVHCI=m
 
 ##
+## file: drivers/cpuidle/Kconfig
+##
+CONFIG_CPU_IDLE=y
+
+##
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
@@ -207,6 +211,21 @@
 CONFIG_DVB_CORE=m
 
 ##
+## file: drivers/mmc/Kconfig
+##
+CONFIG_MMC=m
+
+##
+## file: drivers/mmc/card/Kconfig
+##
+CONFIG_MMC_BLOCK=m
+
+##
+## file: drivers/mmc/host/Kconfig
+##
+CONFIG_MMC_MVSDIO=m
+
+##
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
@@ -261,6 +280,7 @@
 ## file: drivers/mtd/devices/Kconfig
 ##
 # CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_M25P80=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -301,6 +321,11 @@
 # CONFIG_MTD_ONENAND is not set
 
 ##
+## file: drivers/mtd/ubi/Kconfig
+##
+CONFIG_MTD_UBI=y
+
+##
 ## file: drivers/net/Kconfig
 ##
 # CONFIG_NET_ETHERNET is not set
@@ -431,6 +456,11 @@
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
 ##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI_ORION=y
+
+##
 ## file: drivers/ssb/Kconfig
 ##
 # CONFIG_SSB is not set
@@ -523,6 +553,11 @@
 CONFIG_BINFMT_MISC=m
 
 ##
+## file: fs/jffs2/Kconfig
+##
+CONFIG_JFFS2_FS=y
+
+##
 ## file: fs/partitions/Kconfig
 ##
 CONFIG_ACORN_PARTITION=y
@@ -548,6 +583,11 @@
 CONFIG_EFI_PARTITION=y
 
 ##
+## file: fs/ubifs/Kconfig
+##
+CONFIG_UBIFS_FS=y
+
+##
 ## file: kernel/power/Kconfig
 ##
 # CONFIG_PM is not set
@@ -590,49 +630,3 @@
 ##
 CONFIG_X25=m
 
-##
-## file: drivers/mtd/ubi/Kconfig
-##
-CONFIG_MTD_UBI=y
-
-##
-## file: fs/ubifs/Kconfig
-##
-CONFIG_UBIFS_FS=y
-
-##
-## file: fs/jffs2/Kconfig
-##
-CONFIG_JFFS2_FS=y
-
-##
-## file: drivers/mmc/Kconfig
-##
-CONFIG_MMC=m
-
-##
-## file: drivers/mmc/card/Kconfig
-##
-CONFIG_MMC_BLOCK=m
-
-##
-## file: drivers/mmc/host/Kconfig
-##
-CONFIG_MMC_MVSDIO=m
-
-##
-## file: drivers/spi/Kconfig
-##
-CONFIG_SPI_ORION=y
-
-##
-## file: drivers/mtd/devices/Kconfig
-##
-CONFIG_MTD_M25P80=y
-
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-CONFIG_UACCESS_WITH_MEMCPY=y
-

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/config	Wed May 20 13:20:19 2009	(r13641)
@@ -3,7 +3,6 @@
 ##
 CONFIG_BLOCK=y
 CONFIG_LBD=y
-CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_INTEGRITY=y
 
@@ -298,7 +297,6 @@
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 CONFIG_HIDRAW=y
-CONFIG_HID_COMPAT=y
 CONFIG_DRAGONRISE_FF=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -637,7 +635,6 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -833,13 +830,12 @@
 CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
@@ -851,7 +847,6 @@
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
@@ -911,8 +906,8 @@
 ## file: drivers/media/video/cx231xx/Kconfig
 ##
 CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 
 ##
 ## file: drivers/media/video/cx23885/Kconfig
@@ -1119,10 +1114,10 @@
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ISL29003=m
 CONFIG_SGI_XP=m
 CONFIG_SGI_GRU=m
 # CONFIG_SGI_GRU_DEBUG is not set
+CONFIG_ISL29003=m
 
 ##
 ## file: drivers/misc/c2port/Kconfig
@@ -1259,7 +1254,6 @@
 CONFIG_E1000E=m
 CONFIG_IP1000=m
 CONFIG_IGB=m
-# CONFIG_IGB_LRO is not set
 CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_NS83820=m
@@ -1403,8 +1397,8 @@
 CONFIG_TR=y
 CONFIG_IBMTR=m
 CONFIG_IBMOL=m
-CONFIG_3C359=m
 CONFIG_IBMLS=m
+CONFIG_3C359=m
 CONFIG_TMS380TR=m
 CONFIG_TMSPCI=m
 CONFIG_SKISA=m
@@ -1477,9 +1471,6 @@
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
 CONFIG_AT76C50X_USB=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_PRISM54 is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_RTL8180=m
@@ -1492,7 +1483,6 @@
 ## file: drivers/net/wireless/ar9170/Kconfig
 ##
 CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
 
 ##
 ## file: drivers/net/wireless/ath5k/Kconfig
@@ -1560,6 +1550,13 @@
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+
+##
 ## file: drivers/net/wireless/p54/Kconfig
 ##
 CONFIG_P54_COMMON=m
@@ -2036,7 +2033,7 @@
 # CONFIG_SXG is not set
 
 ##
-## file: drivers/staging/uc3222/Kconfig
+## file: drivers/staging/uc2322/Kconfig
 ##
 # CONFIG_USB_SERIAL_ATEN2011 is not set
 
@@ -2117,8 +2114,6 @@
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_LD=m
@@ -2155,7 +2150,6 @@
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -2235,16 +2229,15 @@
 # CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_3DFX_I2C=y
 CONFIG_FB_VT8623=m
-CONFIG_FB_CYBLA=m
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_TMIO is not set
 CONFIG_FB_SM501=m
 CONFIG_FB_METRONOME=m
-# CONFIG_FB_BROADSHEET is not set
 CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
+# CONFIG_FB_BROADSHEET is not set
 
 ##
 ## file: drivers/video/backlight/Kconfig
@@ -2315,11 +2308,6 @@
 ##
 ## file: fs/Kconfig
 ##
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
@@ -2385,6 +2373,13 @@
 CONFIG_BTRFS_FS_POSIX_ACL=y
 
 ##
+## file: fs/cachefiles/Kconfig
+##
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+##
 ## file: fs/cifs/Kconfig
 ##
 CONFIG_CIFS=m
@@ -2394,8 +2389,8 @@
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_EXPERIMENTAL=y
 
 ##
 ## file: fs/coda/Kconfig
@@ -2429,6 +2424,12 @@
 CONFIG_EFS_FS=m
 
 ##
+## file: fs/exofs/Kconfig
+##
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+
+##
 ## file: fs/ext2/Kconfig
 ##
 CONFIG_EXT2_FS=m
@@ -2455,12 +2456,6 @@
 CONFIG_EXT4_FS_SECURITY=y
 
 ##
-## file: fs/exofs/Kconfig
-##
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-
-##
 ## file: fs/fat/Kconfig
 ##
 CONFIG_MSDOS_FS=m
@@ -2480,9 +2475,6 @@
 CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_HISTOGRAM is not set
 # CONFIG_FSCACHE_DEBUG is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
 
 ##
 ## file: fs/fuse/Kconfig
@@ -2692,6 +2684,15 @@
 CONFIG_QNX4FS_FS=m
 
 ##
+## file: fs/quota/Kconfig
+##
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+
+##
 ## file: fs/reiserfs/Kconfig
 ##
 CONFIG_REISERFS_FS=m
@@ -2871,6 +2872,7 @@
 # CONFIG_POWER_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_HW_BRANCH_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 
 ##
@@ -2929,7 +2931,6 @@
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 
 ##
 ## file: lib/Kconfig.kgdb
@@ -3184,11 +3185,11 @@
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
 
@@ -3253,6 +3254,7 @@
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -3284,7 +3286,6 @@
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
 
@@ -3410,7 +3411,6 @@
 ##
 ## file: net/sunrpc/Kconfig
 ##
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 
@@ -3443,7 +3443,6 @@
 ##
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_NL80211=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 # CONFIG_WIRELESS_EXT_SYSFS is not set
@@ -3611,6 +3610,18 @@
 ##
 ## file: unknown
 ##
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+CONFIG_FB_CYBLA=m
+CONFIG_HID_COMPAT=y
+# CONFIG_IGB_LRO is not set
 # CONFIG_KPROBES is not set
+CONFIG_MD_RAID5_RESHAPE=y
+CONFIG_NL80211=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
 

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 20 13:20:19 2009	(r13641)
@@ -124,7 +124,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -359,11 +358,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-# CONFIG_PLX_HERMES is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_ATMEL is not set
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
@@ -375,6 +369,15 @@
 # CONFIG_IPW2100 is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+# CONFIG_PLX_HERMES is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/parisc/Kconfig
 ##
 CONFIG_GSC=y
@@ -544,8 +547,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 
 ##
@@ -758,7 +759,6 @@
 # CONFIG_SND_AD1848 is not set
 # CONFIG_SND_CMI8330 is not set
 # CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
 # CONFIG_SND_CS4236 is not set
 # CONFIG_SND_ES1688 is not set
 # CONFIG_SND_ES18XX is not set
@@ -830,3 +830,11 @@
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+# CONFIG_IDE_ARM is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed May 20 13:20:19 2009	(r13641)
@@ -10,18 +10,13 @@
 # CONFIG_64BIT is not set
 # CONFIG_SPARSE_IRQ is not set
 CONFIG_X86_MPPARSE=y
-## choice: Subarchitecture Type
-CONFIG_X86_PC=y
+# CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_RDC321X is not set
 # CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_VISWS is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_ES7000 is not set
-# CONFIG_X86_BIGSMP is not set
-## end choice
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_VMI=y
 CONFIG_KVM_CLOCK=y
@@ -89,7 +84,6 @@
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_DMAR_GFX_WA=y
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_ISA=y
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
@@ -131,7 +125,6 @@
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
@@ -155,7 +148,6 @@
 CONFIG_X86_POWERNOW_K6=m
 CONFIG_X86_POWERNOW_K7=m
 CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_GX_SUSPMOD=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
@@ -437,8 +429,6 @@
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82875P=m
@@ -446,6 +436,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_I5000=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 ##
 ## file: drivers/firmware/Kconfig
@@ -510,6 +502,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -559,7 +552,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -602,7 +594,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
@@ -878,7 +869,6 @@
 CONFIG_PHANTOM=m
 CONFIG_HP_ILO=m
 CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
 
 ##
 ## file: drivers/mmc/Kconfig
@@ -1174,11 +1164,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
@@ -1194,6 +1179,15 @@
 # CONFIG_IPW2100_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_PCI_MSI=y
@@ -1242,6 +1236,7 @@
 ##
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+CONFIG_DELL_WMI=m
 CONFIG_TC1100_WMI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
@@ -1442,8 +1437,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_TEST=m
 
@@ -1525,7 +1518,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
 
 ##
@@ -1587,7 +1579,6 @@
 CONFIG_PCWATCHDOG=m
 CONFIG_MIXCOMWD=m
 CONFIG_WDT=m
-CONFIG_WDT_501=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
@@ -1663,6 +1654,11 @@
 ## end choice
 
 ##
+## file: mm/Kconfig.debug
+##
+# CONFIG_DEBUG_PAGEALLOC is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 CONFIG_ATM=m
@@ -1782,7 +1778,6 @@
 CONFIG_SND_AZT2320=m
 CONFIG_SND_CMI8330=m
 CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
 CONFIG_SND_CS4236=m
 CONFIG_SND_DT019X=m
 CONFIG_SND_ES968=m
@@ -1890,3 +1885,17 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
+##
+## file: unknown
+##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_SND_CS4232=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_WDT_501=y
+# CONFIG_X86_GENERICARCH is not set
+CONFIG_X86_PC=y
+CONFIG_X86_POWERNOW_K8_ACPI=y
+# CONFIG_X86_VOYAGER is not set
+

Modified: dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem	Wed May 20 13:20:19 2009	(r13641)
@@ -2,19 +2,14 @@
 ## file: arch/x86/Kconfig
 ##
 CONFIG_SMP=y
-## choice: Subarchitecture Type
-# CONFIG_X86_PC is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VSMP is not set
 # CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-CONFIG_X86_GENERICARCH=y
+# CONFIG_X86_RDC321X is not set
 # CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_VISWS is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_ES7000 is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VSMP is not set
-## end choice
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
 CONFIG_NR_CPUS=32
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_NONFATAL=m
@@ -94,3 +89,10 @@
 ##
 # CONFIG_DEBUG_HIGHMEM is not set
 
+##
+## file: unknown
+##
+CONFIG_X86_GENERICARCH=y
+# CONFIG_X86_PC is not set
+# CONFIG_X86_VOYAGER is not set
+

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed May 20 13:20:19 2009	(r13641)
@@ -191,6 +191,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -237,7 +238,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -538,12 +538,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
@@ -563,6 +557,16 @@
 CONFIG_IPW2100_MONITOR=y
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_PCI_MSI=y
@@ -709,8 +713,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_TEST=m
 
@@ -783,7 +785,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_VIRTUAL is not set
 
 ##
@@ -963,3 +964,10 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETSERVO=m
+

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Wed May 20 13:20:19 2009	(r13641)
@@ -55,9 +55,7 @@
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_GAYLE=y
-CONFIG_BLK_DEV_IDEDOUBLER=y
 CONFIG_BLK_DEV_BUDDHA=y
 
 ##
@@ -291,6 +289,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_BLK_DEV_IDEDOUBLER=y
 CONFIG_BLZ1230_SCSI=y
 CONFIG_BLZ2060_SCSI=y
 CONFIG_CYBERSTORMII_SCSI=y
@@ -299,6 +298,7 @@
 # CONFIG_FB_CYBER is not set
 # CONFIG_FB_RETINAZ3 is not set
 # CONFIG_FB_VIRGE is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_OKTAGON_SCSI is not set
 CONFIG_SCSI_AMIGA7XX=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed May 20 13:20:19 2009	(r13641)
@@ -38,7 +38,8 @@
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
 CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
+CONFIG_RTC=m
+CONFIG_GEN_RTC=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -50,7 +51,6 @@
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_FALCON_IDE=y
 
 ##
@@ -104,6 +104,11 @@
 CONFIG_PARPORT_ATARI=m
 
 ##
+## file: drivers/rtc/Kconfig
+##
+# CONFIG_RTC_CLASS is not set
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 # CONFIG_SCSI_PPA is not set
@@ -219,12 +224,9 @@
 CONFIG_ATARI_ROM_ISA=y
 CONFIG_ATARI_SCC=y
 CONFIG_ATARI_SCC_DMA=y
+# CONFIG_IDE_ARM is not set
 CONFIG_NATFEAT=y
 CONFIG_NFBLOCK=y
 CONFIG_NFCON=y
 CONFIG_NFETH=y
 
-# RTC for 2.6.29
-CONFIG_RTC_CLASS=n
-CONFIG_GEN_RTC=m
-CONFIG_RTC=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed May 20 13:20:19 2009	(r13641)
@@ -36,7 +36,6 @@
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_MAC_IDE=y
 
 ##
@@ -213,3 +212,8 @@
 ##
 # CONFIG_SOUND is not set
 
+##
+## file: unknown
+##
+# CONFIG_IDE_ARM 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed May 20 13:20:19 2009	(r13641)
@@ -308,6 +308,7 @@
 CONFIG_SENSORS_MAX1619=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+CONFIG_SENSORS_PCF8591=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -362,7 +363,6 @@
 ##
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -400,7 +400,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -586,7 +585,6 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -635,13 +633,12 @@
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
@@ -650,7 +647,6 @@
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_W9966=m
@@ -1007,11 +1003,6 @@
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WLAN_80211=y
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_USB_ZD1201=m
@@ -1037,6 +1028,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/net/wireless/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
@@ -1075,11 +1075,11 @@
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig
@@ -1265,10 +1265,6 @@
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -1346,7 +1342,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
 
 ##
@@ -1689,7 +1684,16 @@
 ##
 ## file: unknown
 ##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
+CONFIG_MD_RAID5_RESHAPE=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed May 20 13:20:19 2009	(r13641)
@@ -305,6 +305,7 @@
 CONFIG_SENSORS_MAX6650=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+CONFIG_SENSORS_PCF8591=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -360,7 +361,6 @@
 ##
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -400,7 +400,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/ieee1394/Kconfig
@@ -646,7 +645,6 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -797,13 +795,12 @@
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
@@ -815,7 +812,6 @@
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_W9966=m
@@ -1231,11 +1227,6 @@
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 # CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_USB_ZD1201=m
@@ -1261,6 +1252,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/net/wireless/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
@@ -1490,10 +1490,6 @@
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -1523,7 +1519,6 @@
 CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -1620,7 +1615,6 @@
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 CONFIG_FB_SM501=m
@@ -1992,7 +1986,17 @@
 ##
 ## file: unknown
 ##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
+CONFIG_MD_RAID5_RESHAPE=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Wed May 20 13:20:19 2009	(r13641)
@@ -172,6 +172,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_W83781D is not set
@@ -205,7 +206,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Wed May 20 13:20:19 2009	(r13641)
@@ -183,6 +183,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -233,7 +234,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Wed May 20 13:20:19 2009	(r13641)
@@ -230,6 +230,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -281,7 +282,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 
 ##
@@ -517,6 +517,8 @@
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
@@ -525,10 +527,6 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_BROADCOM_PHY=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -541,6 +539,12 @@
 # CONFIG_ARCNET is not set
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_BROADCOM_PHY=y
+# CONFIG_FIXED_PHY is not set
+
+##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set
@@ -700,8 +704,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
@@ -774,7 +776,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_VIRTUAL is not set
 
 ##
@@ -1021,7 +1022,10 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
+# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Wed May 20 13:20:19 2009	(r13641)
@@ -231,6 +231,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -282,7 +283,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 
 ##
@@ -318,7 +318,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -548,6 +547,8 @@
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
@@ -556,10 +557,6 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_BROADCOM_PHY=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -572,6 +569,12 @@
 # CONFIG_ARCNET is not set
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_BROADCOM_PHY=y
+# CONFIG_FIXED_PHY is not set
+
+##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set
@@ -731,8 +734,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
@@ -805,7 +806,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_VIRTUAL is not set
 
 ##
@@ -1051,7 +1051,11 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Wed May 20 13:20:19 2009	(r13641)
@@ -307,6 +307,7 @@
 CONFIG_SENSORS_MAX1619=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+CONFIG_SENSORS_PCF8591=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -361,7 +362,6 @@
 ##
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -399,7 +399,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -585,7 +584,6 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -634,13 +632,12 @@
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
@@ -649,7 +646,6 @@
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_W9966=m
@@ -1006,11 +1002,6 @@
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WLAN_80211=y
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_USB_ZD1201=m
@@ -1036,6 +1027,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/net/wireless/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
@@ -1074,11 +1074,11 @@
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig
@@ -1264,10 +1264,6 @@
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -1345,7 +1341,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
 
 ##
@@ -1671,7 +1666,16 @@
 ##
 ## file: unknown
 ##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
+CONFIG_MD_RAID5_RESHAPE=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed May 20 13:20:19 2009	(r13641)
@@ -304,6 +304,7 @@
 CONFIG_SENSORS_MAX6650=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+CONFIG_SENSORS_PCF8591=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -359,7 +360,6 @@
 ##
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_MAX6875=m
 
 ##
@@ -399,7 +399,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/ieee1394/Kconfig
@@ -645,7 +644,6 @@
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -796,13 +794,12 @@
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
@@ -814,7 +811,6 @@
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_W9966=m
@@ -1231,11 +1227,6 @@
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 # CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_USB_ZD1201=m
@@ -1261,6 +1252,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/net/wireless/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
@@ -1490,10 +1490,6 @@
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -1523,7 +1519,6 @@
 CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -1620,7 +1615,6 @@
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 CONFIG_FB_SM501=m
@@ -1987,7 +1981,17 @@
 ##
 ## file: unknown
 ##
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
+CONFIG_MD_RAID5_RESHAPE=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed May 20 13:20:19 2009	(r13641)
@@ -197,7 +197,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -566,11 +565,6 @@
 CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 CONFIG_WLAN_80211=y
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_USB_ZD1201=m
@@ -594,6 +588,15 @@
 # CONFIG_IPW2200_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
 ## file: drivers/pci/hotplug/Kconfig
 ##
 # CONFIG_HOTPLUG_PCI is not set
@@ -627,6 +630,7 @@
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SYM53C8XX_2=m
 
 ##
 ## file: drivers/serial/Kconfig
@@ -693,8 +697,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_LD is not set
 
@@ -914,9 +916,10 @@
 ##
 ## file: unknown
 ##
+# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
-
-CONFIG_SCSI_SYM53C8XX_2=m
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed May 20 13:20:19 2009	(r13641)
@@ -230,6 +230,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -281,7 +282,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 
 ##
@@ -517,6 +517,8 @@
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
@@ -525,10 +527,6 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_BROADCOM_PHY=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -541,6 +539,12 @@
 # CONFIG_ARCNET is not set
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_BROADCOM_PHY=y
+# CONFIG_FIXED_PHY is not set
+
+##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set
@@ -700,8 +704,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
@@ -774,7 +776,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_VIRTUAL is not set
 
 ##
@@ -1021,7 +1022,10 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
+# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Wed May 20 13:20:19 2009	(r13641)
@@ -230,6 +230,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -281,7 +282,6 @@
 ##
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 
 ##
@@ -317,7 +317,6 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -547,6 +546,8 @@
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
@@ -555,10 +556,6 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_BROADCOM_PHY=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -571,6 +568,12 @@
 # CONFIG_ARCNET is not set
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_BROADCOM_PHY=y
+# CONFIG_FIXED_PHY is not set
+
+##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set
@@ -730,8 +733,6 @@
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
@@ -804,7 +805,6 @@
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_VIRTUAL is not set
 
 ##
@@ -1050,7 +1050,11 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed May 20 13:20:19 2009	(r13641)
@@ -24,8 +24,8 @@
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
 CONFIG_XMON=y
-CONFIG_XMON_DISASSEMBLY=y
 # CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
 # CONFIG_VIRQ_DEBUG is not set
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
@@ -235,6 +235,7 @@
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -282,7 +283,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
 
 ##
 ## file: drivers/ide/Kconfig
@@ -320,7 +320,6 @@
 CONFIG_BLK_DEV_VIA82CXXX=m
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -645,12 +644,6 @@
 CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_HERMES=m
-CONFIG_APPLE_AIRPORT=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
 CONFIG_ATMEL=m
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCMCIA_ATMEL=m
@@ -664,6 +657,16 @@
 # CONFIG_IPW2100 is not set
 
 ##
+## file: drivers/net/wireless/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_APPLE_AIRPORT=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+
+##
 ## file: drivers/pci/Kconfig
 ##
 # CONFIG_PCI_DEBUG is not set
@@ -686,11 +689,6 @@
 CONFIG_TCIC=m
 
 ##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_PPC=y
-
-##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_DPT_I2O=m
@@ -814,8 +812,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_TEST=m
 
@@ -882,7 +878,6 @@
 CONFIG_FB_3DFX=y
 CONFIG_FB_VOODOO1=y
 CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
 CONFIG_FB_IBM_GXT4500=m
 # CONFIG_FB_VIRTUAL is not set
 
@@ -1129,3 +1124,12 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
+##
+## file: unknown
+##
+CONFIG_FB_TRIDENT_ACCEL=y
+# CONFIG_IDE_ARM is not set
+CONFIG_RTC_DRV_PPC=y
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETSERVO=m
+

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp	Wed May 20 13:20:19 2009	(r13641)
@@ -1 +1,5 @@
+##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
 CONFIG_SMP=y
+

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Wed May 20 13:20:19 2009	(r13641)
@@ -12,7 +12,6 @@
 # CONFIG_SMALL_STACK is not set
 # CONFIG_CHECK_STACK is not set
 # CONFIG_WARN_STACK is not set
-CONFIG_MACHCHK_WARNING=y
 CONFIG_QDIO=y
 CONFIG_IPL=y
 # CONFIG_PROCESS_DEBUG is not set
@@ -220,6 +219,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_MACHCHK_WARNING=y
 # CONFIG_QDIO_DEBUG is not set
 CONFIG_VIRT_TIMER=y
 

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed May 20 13:20:19 2009	(r13641)
@@ -69,6 +69,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -113,7 +114,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 # CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 
 ##
 ## file: drivers/ide/Kconfig
@@ -146,7 +146,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/mouse/Kconfig
@@ -326,8 +325,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_TEST is not set
 
@@ -417,3 +414,10 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
+##
+## file: unknown
+##
+# CONFIG_IDE_ARM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO 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 May 20 13:17:46 2009	(r13640)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Wed May 20 13:20:19 2009	(r13641)
@@ -71,6 +71,7 @@
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -115,7 +116,6 @@
 ## file: drivers/i2c/chips/Kconfig
 ##
 # CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
 
 ##
 ## file: drivers/ide/Kconfig
@@ -148,7 +148,6 @@
 # CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
 
 ##
 ## file: drivers/input/mouse/Kconfig
@@ -328,8 +327,6 @@
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_TEST is not set
 
@@ -419,3 +416,10 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
+##
+## file: unknown
+##
+# CONFIG_IDE_ARM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+

More information about the Kernel-svn-changes mailing list