[kernel] r16865 - in dists/trunk/linux-2.6/debian/config: . alpha armel hppa i386/none ia64 kernelarch-x86 m68k mips mipsel powerpc s390 sh4 sparc
Bastian Blank
waldi at alioth.debian.org
Tue Feb 8 19:08:48 UTC 2011
Author: waldi
Date: Tue Feb 8 19:08:41 2011
New Revision: 16865
Log:
debian/config: Reorder.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/armel/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.kirkwood
dists/trunk/linux-2.6/debian/config/armel/config.orion5x
dists/trunk/linux-2.6/debian/config/armel/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/hppa/config.parisc
dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp
dists/trunk/linux-2.6/debian/config/i386/none/config.486
dists/trunk/linux-2.6/debian/config/i386/none/config.686
dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
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/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.octeon
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.loongson-2f
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
dists/trunk/linux-2.6/debian/config/s390/config
dists/trunk/linux-2.6/debian/config/sh4/config
dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
dists/trunk/linux-2.6/debian/config/sparc/config
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -160,7 +160,6 @@
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_DIGIEPCA is not set
-CONFIG_ESPSERIAL=m
CONFIG_MOXA_INTELLIO=m
CONFIG_ISI=m
CONFIG_SYNCLINK=m
@@ -276,7 +275,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -297,7 +295,6 @@
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_VOODOO3=m
CONFIG_I2C_ELEKTOR=m
CONFIG_I2C_PCA_ISA=m
CONFIG_I2C_STUB=m
@@ -750,12 +747,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
CONFIG_PCMCIA_RAYCS=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -782,7 +773,6 @@
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCCARD=m
-CONFIG_PCMCIA_DEBUG=y
CONFIG_PCMCIA=m
CONFIG_CARDBUS=y
CONFIG_YENTA=m
@@ -790,6 +780,7 @@
CONFIG_I82092=m
CONFIG_I82365=m
CONFIG_TCIC=m
+CONFIG_PCMCIA_DEBUG=y
##
## file: drivers/pnp/Kconfig
@@ -1118,8 +1109,6 @@
CONFIG_SND_CMI8330=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
CONFIG_SND_ES1688=m
CONFIG_SND_ES18XX=m
CONFIG_SND_GUSCLASSIC=m
@@ -1136,7 +1125,6 @@
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SGALAXY=m
CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m
@@ -1193,5 +1181,17 @@
##
## file: unknown
##
+CONFIG_ESPSERIAL=m
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_SND_DT019X=m
+CONFIG_SND_ES968=m
+CONFIG_SND_SGALAXY=m
+CONFIG_STRIP=m
+CONFIG_WAVELAN=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -14,9 +14,17 @@
CONFIG_EARLY_PRINTK=y
##
-## file: drivers/ieee1394/Kconfig
+## file: drivers/input/misc/Kconfig
##
-# CONFIG_IEEE1394 is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_APPLETOUCH=m
##
## file: drivers/net/hamradio/Kconfig
@@ -34,6 +42,11 @@
# CONFIG_IPW2100 is not set
##
+## file: drivers/parport/Kconfig
+##
+# CONFIG_PARPORT_PC is not set
+
+##
## file: drivers/scsi/Kconfig
##
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -82,16 +95,7 @@
## end choice
##
-### file: drivers/input/mouse/Kconfig
-##
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_APPLETOUCH=m
-
-##
-## file: drivers/input/misc/Kconfig
+## file: unknown
##
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+# CONFIG_IEEE1394 is not set
-# CONFIG_PARPORT_PC is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Tue Feb 8 19:08:41 2011 (r16865)
@@ -18,7 +18,6 @@
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -60,16 +59,16 @@
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
CONFIG_SATA_SIL24=m
-CONFIG_SATA_SVW=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
@@ -78,18 +77,18 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
+CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
##
## file: drivers/block/Kconfig
@@ -198,7 +197,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -218,7 +216,6 @@
# CONFIG_I2C_VIAPRO is not set
CONFIG_I2C_IOP3XX=y
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_STUB is not set
@@ -468,9 +465,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WLAN_80211=y
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -687,11 +681,6 @@
# CONFIG_WAN_ROUTER is not set
##
-## file: net/wireless/Kconfig
-##
-CONFIG_WIRELESS_EXT=y
-
-##
## file: sound/drivers/Kconfig
##
CONFIG_SND_DUMMY=m
@@ -751,3 +740,13 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Tue Feb 8 19:08:41 2011 (r16865)
@@ -18,7 +18,6 @@
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
CONFIG_ARCH_IXP4XX=y
-# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -69,62 +68,62 @@
CONFIG_ATA=m
# CONFIG_SATA_PMP is not set
# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_SIL24 is not set
CONFIG_ATA_SFF=y
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
CONFIG_SATA_VIA=m
# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_IXP4XX_CF is not set
-# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_ATA_GENERIC is not set
##
## file: drivers/block/Kconfig
@@ -225,7 +224,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -246,7 +244,6 @@
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_STUB is not set
# CONFIG_SCx200_ACB is not set
@@ -486,9 +483,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WLAN_80211=y
CONFIG_ATMEL=m
# CONFIG_PCI_ATMEL is not set
@@ -825,3 +819,13 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Tue Feb 8 19:08:41 2011 (r16865)
@@ -20,7 +20,6 @@
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
CONFIG_ARCH_KIRKWOOD=y
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_KS8695 is not set
@@ -62,7 +61,6 @@
CONFIG_MACH_GURUPLUG=y
CONFIG_MACH_TS219=y
CONFIG_MACH_TS41X=y
-CONFIG_MACH_OPENRD=y
CONFIG_MACH_OPENRD_BASE=y
CONFIG_MACH_OPENRD_CLIENT=y
CONFIG_MACH_OPENRD_ULTIMATE=y
@@ -81,62 +79,62 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+# CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_SIL24 is not set
CONFIG_ATA_SFF=y
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=m
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_ATA_GENERIC is not set
##
## file: drivers/bluetooth/Kconfig
@@ -351,9 +349,9 @@
##
## file: drivers/mtd/nand/Kconfig
##
+# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_CAFE is not set
@@ -411,12 +409,6 @@
# CONFIG_FIXED_PHY is not set
##
-## file: drivers/net/wireless/Kconfig
-##
-CONFIG_WLAN_PRE80211=y
-CONFIG_WLAN_80211=y
-
-##
## file: drivers/pcmcia/Kconfig
##
# CONFIG_PCCARD is not set
@@ -511,6 +503,16 @@
# CONFIG_SSB is not set
##
+## file: drivers/staging/udlfb/Kconfig
+##
+CONFIG_FB_UDL=m
+
+##
+## file: drivers/staging/xgifb/Kconfig
+##
+CONFIG_FB_XGI=m
+
+##
## file: drivers/usb/Kconfig
##
CONFIG_USB_SUPPORT=y
@@ -624,20 +626,25 @@
CONFIG_WAN_ROUTER=m
##
-### file: drivers/staging/xgifb/Kconfig
+## file: sound/soc/Kconfig
##
-CONFIG_FB_XGI=m
+CONFIG_SND_SOC=m
##
-## file: drivers/staging/udlfb/Kconfig
+## file: sound/soc/codecs/Kconfig
##
-CONFIG_FB_UDL=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC=m
+##
+## file: sound/soc/kirkwood/Kconfig
+##
CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_I2S=m
CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_CS42L51=m
+
+##
+## file: unknown
+##
+# CONFIG_ARCH_L7200 is not set
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Tue Feb 8 19:08:41 2011 (r16865)
@@ -20,7 +20,6 @@
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
CONFIG_ARCH_ORION5X=y
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_NS9XXX is not set
@@ -74,62 +73,62 @@
##
CONFIG_ATA=m
# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_SIL24 is not set
CONFIG_ATA_SFF=y
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=m
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_ATA_GENERIC is not set
##
## file: drivers/bluetooth/Kconfig
@@ -332,9 +331,9 @@
##
## file: drivers/mtd/nand/Kconfig
##
+# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_CAFE is not set
@@ -387,12 +386,6 @@
# CONFIG_FIXED_PHY is not set
##
-## file: drivers/net/wireless/Kconfig
-##
-CONFIG_WLAN_PRE80211=y
-CONFIG_WLAN_80211=y
-
-##
## file: drivers/pcmcia/Kconfig
##
# CONFIG_PCCARD is not set
@@ -585,3 +578,10 @@
##
CONFIG_WAN_ROUTER=m
+##
+## file: unknown
+##
+# CONFIG_ARCH_L7200 is not set
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Tue Feb 8 19:08:41 2011 (r16865)
@@ -20,7 +20,6 @@
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
@@ -73,58 +72,58 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_SIL24=m
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+CONFIG_SATA_SX4=m
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
CONFIG_SATA_VIA=m
# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_ATA_GENERIC is not set
##
## file: drivers/atm/Kconfig
@@ -451,3 +450,8 @@
##
# CONFIG_WAN_ROUTER is not set
+##
+## file: unknown
+##
+# CONFIG_ARCH_L7200 is not set
+
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -12,9 +12,7 @@
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEBUG_CFQ_IOSCHED is not set
## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
@@ -26,11 +24,11 @@
CONFIG_CRYPTO=y
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m
-# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_PCRYPT=m
+# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m
@@ -95,71 +93,71 @@
CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=m
# CONFIG_SATA_AHCI_PLATFORM is not set
+CONFIG_SATA_INIC162X=m
CONFIG_SATA_SIL24=m
CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=m
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
CONFIG_PDC_ADMA=m
CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_ATA_BMDMA=y
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
-# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATP867X=m
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
+CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD64X=m
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-CONFIG_ATA_GENERIC=m
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-CONFIG_PATA_IT821X=m
# CONFIG_PATA_IT8213 is not set
+CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_MARVELL=m
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_QDI is not set
# CONFIG_PATA_RADISYS is not set
CONFIG_PATA_RDC=m
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
+CONFIG_PATA_SCH=m
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
CONFIG_PATA_SIS=m
CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_WINBOND_VLB is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_ACPI is not set
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
##
## file: drivers/atm/Kconfig
@@ -248,6 +246,7 @@
# CONFIG_RAW_DRIVER is not set
CONFIG_HANGCHECK_TIMER=m
CONFIG_TELCLOCK=m
+CONFIG_RAMOOPS=m
##
## file: drivers/char/hw_random/Kconfig
@@ -274,11 +273,6 @@
CONFIG_TCG_INFINEON=m
##
-## file: drivers/clocksource/Kconfig
-##
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-
-##
## file: drivers/connector/Kconfig
##
CONFIG_CONNECTOR=m
@@ -384,21 +378,21 @@
##
## file: drivers/hid/Kconfig
##
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
CONFIG_HID_3M_PCT=m
CONFIG_HID_ACRUX_FF=m
CONFIG_HID_CANDO=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
CONFIG_HID_PRODIKEYS=m
-CONFIG_DRAGONRISE_FF=y
CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EGALAX=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
CONFIG_HID_TWINHAN=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
CONFIG_LOGITECH_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGIG940_FF=y
@@ -411,20 +405,20 @@
CONFIG_PANTHERLORD_FF=y
CONFIG_HID_PETALYNX=m
CONFIG_HID_PICOLCD=m
+CONFIG_HID_QUANTA=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_ROCCAT_KONE=m
CONFIG_HID_ROCCAT_PYRA=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
CONFIG_HID_SUNPLUS=m
CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
CONFIG_HID_TOPSEED=m
CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_STANTUM=m
-CONFIG_GREENASIA_FF=y
-CONFIG_SMARTJOYPLUS_FF=y
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WACOM_POWER_SUPPLY=y
@@ -453,7 +447,6 @@
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
CONFIG_SENSORS_ADT7475=m
CONFIG_SENSORS_ASC7621=m
CONFIG_SENSORS_ATXP1=m
@@ -516,11 +509,11 @@
# CONFIG_I2C_GPIO is not set
# CONFIG_I2C_INTEL_MID is not set
CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_SIMTEC=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_PCA_PLATFORM=m
##
## file: drivers/ide/Kconfig
@@ -544,11 +537,6 @@
CONFIG_I7300_IDLE=m
##
-## file: drivers/ieee1394/Kconfig
-##
-# CONFIG_IEEE1394 is not set
-
-##
## file: drivers/ieee802154/Kconfig
##
CONFIG_IEEE802154_DRIVERS=m
@@ -602,6 +590,7 @@
##
## file: drivers/infiniband/hw/qib/Kconfig
+##
CONFIG_INFINIBAND_QIB=m
##
@@ -682,10 +671,9 @@
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_MCS is not set
-CONFIG_QT2160=m
CONFIG_KEYBOARD_LM8323=m
CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
CONFIG_KEYBOARD_OPENCORES=m
CONFIG_KEYBOARD_STOWAWAY=m
@@ -758,8 +746,8 @@
CONFIG_TOUCHSCREEN_USB_E2I=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_TOUCHSCREEN_W90X900=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
##
## file: drivers/isdn/Kconfig
@@ -847,8 +835,6 @@
CONFIG_MD_RAID456=m
#. Experimental
# CONFIG_MULTICORE_RAID456 is not set
-#. Self-test
-# CONFIG_ASYNC_RAID6_TEST is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BLK_DEV_DM=m
@@ -878,7 +864,6 @@
## file: drivers/media/IR/Kconfig
##
CONFIG_IR_CORE=m
-CONFIG_RC_MAP=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
@@ -886,13 +871,18 @@
CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
CONFIG_IR_IMON=m
CONFIG_IR_MCEUSB=m
# CONFIG_IR_NUVOTON is not set
-CONFIG_IR_ENE=m
CONFIG_IR_STREAMZAP=m
##
+## file: drivers/media/IR/keymaps/Kconfig
+##
+CONFIG_RC_MAP=m
+
+##
## file: drivers/media/common/tuners/Kconfig
##
CONFIG_MEDIA_ATTACH=y
@@ -929,11 +919,6 @@
CONFIG_DVB_DM1105=m
##
-## file: drivers/media/dvb/firewire/Kconfig
-##
-CONFIG_DVB_FIREDTV=m
-
-##
## file: drivers/media/dvb/dvb-usb/Kconfig
##
CONFIG_DVB_USB=m
@@ -970,6 +955,11 @@
CONFIG_DVB_USB_LME2510=m
##
+## file: drivers/media/dvb/firewire/Kconfig
+##
+CONFIG_DVB_FIREDTV=m
+
+##
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
@@ -1007,7 +997,6 @@
CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3304=m
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
CONFIG_DVB_S921=m
@@ -1090,8 +1079,6 @@
## file: drivers/media/video/Kconfig
##
CONFIG_VIDEO_CAPTURE_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -1127,12 +1114,6 @@
CONFIG_VIDEO_BWQCAM=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_HEXIUM_ORION=m
@@ -1151,11 +1132,12 @@
CONFIG_SOC_CAMERA_OV9640=m
CONFIG_VIDEO_SH_MOBILE_CEU=m
CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_USB_OV511 is not set
CONFIG_USB_SE401=m
CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
##
## file: drivers/media/video/au0828/Kconfig
@@ -1221,7 +1203,9 @@
## file: drivers/media/video/gspca/Kconfig
##
CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
CONFIG_USB_GSPCA_ETOMS=m
CONFIG_USB_GSPCA_FINEPIX=m
CONFIG_USB_GSPCA_JEILINJ=m
@@ -1256,8 +1240,6 @@
CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CPIA1=m
##
## file: drivers/media/video/gspca/gl860/Kconfig
@@ -1305,8 +1287,8 @@
##
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
##
## file: drivers/media/video/saa7164/Kconfig
@@ -1329,7 +1311,6 @@
CONFIG_USB_VICAM=m
CONFIG_USB_IBMCAM=m
CONFIG_USB_KONICAWC=m
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
##
## file: drivers/media/video/usbvision/Kconfig
@@ -1401,11 +1382,9 @@
CONFIG_HTC_PASIC3=m
CONFIG_TPS65010=m
CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8994=m
-# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
+CONFIG_MFD_WM8994=m
CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
# CONFIG_AB3100_CORE is not set
@@ -1426,6 +1405,7 @@
CONFIG_ICS932S401=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_SGI_XP=m
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
CONFIG_SGI_GRU=m
# CONFIG_SGI_GRU_DEBUG is not set
CONFIG_APDS9802ALS=m
@@ -1439,7 +1419,6 @@
CONFIG_DS1682=m
CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
-CONFIG_RAMOOPS=m
CONFIG_BMP085=m
# CONFIG_PCH_PHUB is not set
@@ -1487,8 +1466,8 @@
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_SDHCI=m
-CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
@@ -1538,11 +1517,11 @@
##
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_RICOH=m
CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_CS553X=m
CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_RICOH=m
CONFIG_MTD_ALAUDA=m
##
@@ -1580,8 +1559,8 @@
CONFIG_EQUALIZER=m
CONFIG_TUN=m
CONFIG_VETH=m
-CONFIG_NET_ETHERNET=y
CONFIG_MII=m
+CONFIG_NET_ETHERNET=y
CONFIG_CASSINI=m
CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set
@@ -1589,7 +1568,6 @@
CONFIG_DNET=m
CONFIG_PCNET32=m
CONFIG_KSZ884X_PCI=m
-# CONFIG_FORCEDETH_NAPI is not set
CONFIG_R6040=m
CONFIG_SMSC9420=m
CONFIG_TLAN=m
@@ -1862,21 +1840,14 @@
## file: drivers/net/wimax/i2400m/Kconfig
##
CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
##
## file: drivers/net/wireless/Kconfig
##
CONFIG_WLAN=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
@@ -1884,8 +1855,6 @@
CONFIG_AT76C50X_USB=m
# CONFIG_PRISM54 is not set
CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
CONFIG_ADM8211=m
CONFIG_MAC80211_HWSIM=m
CONFIG_MWL8K=m
@@ -1911,7 +1880,6 @@
## file: drivers/net/wireless/ath/ath9k/Kconfig
##
CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
# CONFIG_ATH9K_DEBUGFS is not set
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -1961,15 +1929,12 @@
## file: drivers/net/wireless/iwlwifi/Kconfig
##
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
# CONFIG_IWLWIFI_DEBUG is not set
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLAGN=m
CONFIG_IWL4965=y
CONFIG_IWL5000=y
CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
##
## file: drivers/net/wireless/iwmc3200wifi/Kconfig
@@ -1979,6 +1944,17 @@
# CONFIG_IWM_TRACING is not set
##
+## file: drivers/net/wireless/libertas/Kconfig
+##
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+
+##
## file: drivers/net/wireless/orinoco/Kconfig
##
# CONFIG_HERMES_PRISM is not set
@@ -2014,12 +1990,22 @@
# CONFIG_RT2X00_DEBUG is not set
##
-## file: drivers/net/wireless/wl12xx/Kconfig
+## file: drivers/net/wireless/rtl818x/Kconfig
+##
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+
+##
+## file: drivers/net/wireless/wl1251/Kconfig
##
-CONFIG_WL12XX=m
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
+
+##
+## file: drivers/net/wireless/wl12xx/Kconfig
+##
+CONFIG_WL12XX=m
CONFIG_WL1271=m
CONFIG_WL1271_SPI=m
CONFIG_WL1271_SDIO=m
@@ -2046,7 +2032,6 @@
## file: drivers/pci/Kconfig
##
CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=m
CONFIG_PCI_IOV=y
@@ -2079,7 +2064,6 @@
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_IOCTL is not set
CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
@@ -2097,6 +2081,7 @@
CONFIG_PANASONIC_LAPTOP=m
CONFIG_COMPAL_LAPTOP=m
CONFIG_SONY_LAPTOP=m
+# CONFIG_RAR_REGISTER is not set
##
## file: drivers/pnp/Kconfig
@@ -2107,9 +2092,9 @@
## file: drivers/power/Kconfig
##
# CONFIG_POWER_SUPPLY is not set
-# CONFIG_TEST_POWER is not set
CONFIG_WM831X_POWER=m
CONFIG_WM8350_POWER=m
+# CONFIG_TEST_POWER is not set
CONFIG_BATTERY_DS2782=m
CONFIG_BATTERY_BQ27x00=m
CONFIG_BATTERY_MAX17040=m
@@ -2120,6 +2105,10 @@
##
CONFIG_PPS=m
# CONFIG_PPS_DEBUG is not set
+
+##
+## file: drivers/pps/clients/Kconfig
+##
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
@@ -2388,10 +2377,10 @@
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_LM70_LLP=m
# CONFIG_SPI_TOPCLIFF_PCH is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
-CONFIG_SPI_LM70_LLP=m
# CONFIG_SPI_SPIDEV is not set
CONFIG_SPI_TLE62X0=m
@@ -2408,33 +2397,19 @@
# CONFIG_STAGING_EXCLUDE_BUILD is not set
##
-## file: drivers/staging/altpciechdma/Kconfig
-##
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-
-##
-## file: drivers/staging/android/Kconfig
+## file: drivers/staging/asus_oled/Kconfig
##
-# CONFIG_ANDROID is not set
-# CONFIG_ANDROID_BINDER_IPC is not set
-# CONFIG_ANDROID_LOGGER is not set
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+# CONFIG_ASUS_OLED is not set
##
-## file: drivers/staging/asus_oled/Kconfig
+## file: drivers/staging/autofs/Kconfig
##
-# CONFIG_ASUS_OLED is not set
+CONFIG_AUTOFS_FS=m
##
## file: drivers/staging/batman-adv/Kconfig
##
# CONFIG_BATMAN_ADV is not set
-
-##
-## file: drivers/staging/b3dfg/Kconfig
-##
-# CONFIG_B3DFG is not set
##
## file: drivers/staging/comedi/Kconfig
@@ -2442,6 +2417,13 @@
# CONFIG_COMEDI is not set
##
+## file: drivers/staging/cpia/Kconfig
+##
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+
+##
## file: drivers/staging/crystalhd/Kconfig
##
# CONFIG_CRYSTALHD is not set
@@ -2452,21 +2434,6 @@
# CONFIG_VIDEO_CX25821 is not set
##
-## file: drivers/staging/dream/Kconfig
-##
-# CONFIG_INPUT_GPIO is not set
-
-##
-## file: drivers/staging/dst/Kconfig
-##
-# CONFIG_DST is not set
-
-##
-## file: drivers/staging/dt3155/Kconfig
-##
-# CONFIG_DT3155 is not set
-
-##
## file: drivers/staging/echo/Kconfig
##
# CONFIG_ECHO is not set
@@ -2502,16 +2469,6 @@
# CONFIG_LINE6_USB is not set
##
-## file: drivers/staging/otus/Kconfig
-##
-# CONFIG_OTUS is not set
-
-##
-## file: drivers/staging/p9auth/Kconfig
-##
-# CONFIG_PLAN9AUTH is not set
-
-##
## file: drivers/staging/panel/Kconfig
##
# CONFIG_PANEL is not set
@@ -2522,11 +2479,6 @@
# CONFIG_IDE_PHISON is not set
##
-## file: drivers/staging/poch/Kconfig
-##
-# CONFIG_POCH is not set
-
-##
## file: drivers/staging/pohmelfs/Kconfig
##
# CONFIG_POHMELFS is not set
@@ -2537,11 +2489,6 @@
# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
##
-## file: drivers/staging/rar/Kconfig
-##
-# CONFIG_RAR_REGISTER is not set
-
-##
## file: drivers/staging/rt2860/Kconfig
##
# CONFIG_RT2860 is not set
@@ -2552,11 +2499,6 @@
# CONFIG_RT2870 is not set
##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-# CONFIG_RTL8187SE is not set
-
-##
## file: drivers/staging/rtl8192e/Kconfig
##
# CONFIG_RTL8192E is not set
@@ -2582,6 +2524,11 @@
# CONFIG_FB_SM7XX is not set
##
+## file: drivers/staging/smbfs/Kconfig
+##
+# CONFIG_SMB_FS is not set
+
+##
## file: drivers/staging/speakup/Kconfig
##
CONFIG_SPEAKUP=m
@@ -2601,6 +2548,11 @@
CONFIG_SPEAKUP_SYNTH_DUMMY=m
##
+## file: drivers/staging/stradis/Kconfig
+##
+CONFIG_VIDEO_STRADIS=m
+
+##
## file: drivers/staging/udlfb/Kconfig
##
# CONFIG_FB_UDL is not set
@@ -2830,9 +2782,7 @@
## file: drivers/uwb/Kconfig
##
CONFIG_UWB=m
-CONFIG_UWB_WLP=m
CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
##
## file: drivers/vhost/Kconfig
@@ -2974,30 +2924,6 @@
CONFIG_AFS_FSCACHE=y
##
-## file: fs/aufs/Kconfig
-##
-CONFIG_AUFS_FS=m
-## choice: Maximum number of branches
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-## end choice
-# CONFIG_AUFS_HINOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SP_IATTR is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-# CONFIG_AUFS_DEBUG is not set
-
-##
-## file: fs/autofs/Kconfig
-##
-CONFIG_AUTOFS_FS=m
-
-##
## file: fs/autofs4/Kconfig
##
CONFIG_AUTOFS4_FS=m
@@ -3313,7 +3239,6 @@
##
## file: fs/notify/inotify/Kconfig
##
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
##
@@ -3402,11 +3327,6 @@
## end choice
##
-## file: fs/smbfs/Kconfig
-##
-# CONFIG_SMB_FS is not set
-
-##
## file: fs/squashfs/Kconfig
##
CONFIG_SQUASHFS=m
@@ -3496,14 +3416,14 @@
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
@@ -3532,7 +3452,6 @@
# CONFIG_SLOB is not set
## end choice
CONFIG_PROFILING=y
-# CONFIG_SLOW_WORK_DEBUG is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -3588,7 +3507,6 @@
CONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SYSPROF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_FTRACE_SYSCALLS is not set
## choice: Branch Profiling
@@ -3596,11 +3514,7 @@
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
## end choice
-# CONFIG_POWER_TRACER is not set
# CONFIG_STACK_TRACER is not set
-# CONFIG_HW_BRANCH_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_BENCHMARK is not set
@@ -3623,8 +3537,6 @@
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
-#. everything except {DUMP SIGNAL}
-CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
CONFIG_STRIP_ASM_SYMS=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
@@ -3678,6 +3590,8 @@
# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
+#. Self-test
+# CONFIG_ASYNC_RAID6_TEST is not set
##
## file: lib/Kconfig.kgdb
@@ -3731,7 +3645,6 @@
##
CONFIG_BT=m
CONFIG_BT_L2CAP=m
-CONFIG_BT_L2CAP_EXT_FEATURES=y
CONFIG_BT_SCO=m
##
@@ -3825,7 +3738,6 @@
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=y
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
##
## file: net/decnet/Kconfig
@@ -3979,7 +3891,7 @@
CONFIG_IP6_NF_SECURITY=m
##
-## file: net/llc/Kconfig
+## file: net/l2tp/Kconfig
##
CONFIG_L2TP=m
CONFIG_L2TP_DEBUGFS=m
@@ -4006,7 +3918,6 @@
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
##
## file: net/netfilter/Kconfig
@@ -4071,6 +3982,7 @@
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -4079,7 +3991,6 @@
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -4088,7 +3999,6 @@
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
##
## file: net/netfilter/ipvs/Kconfig
@@ -4219,7 +4129,6 @@
## file: net/sunrpc/Kconfig
##
CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPCSEC_GSS_SPKM3=m
##
## file: net/tipc/Kconfig
@@ -4229,7 +4138,6 @@
CONFIG_TIPC_ZONES=3
CONFIG_TIPC_CLUSTERS=1
CONFIG_TIPC_NODES=255
-CONFIG_TIPC_SLAVE_NODES=0
CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_LOG=0
# CONFIG_TIPC_DEBUG is not set
@@ -4254,9 +4162,7 @@
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT=y
# CONFIG_WIRELESS_EXT_SYSFS is not set
CONFIG_LIB80211=m
# CONFIG_LIB80211_DEBUG is not set
@@ -4290,14 +4196,18 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
# CONFIG_SECURITY_PATH is not set
-CONFIG_SECURITY_FILE_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_INTEL_TXT is not set
CONFIG_LSM_MMAP_MIN_ADDR=32768
-# CONFIG_SECURITY_APPARMOR is not set
+## choice: Default security module
CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_DAC is not set
+## end choice
+
+##
+## file: security/apparmor/Kconfig
+##
+# CONFIG_SECURITY_APPARMOR is not set
##
## file: security/integrity/ima/Kconfig
@@ -4384,10 +4294,10 @@
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m
CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_HDSPM=m
CONFIG_SND_HIFIER=m
CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_PCXHR=m
CONFIG_SND_RIPTIDE=m
CONFIG_SND_VIRTUOSO=m
@@ -4451,6 +4361,69 @@
##
## file: unknown
##
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_ATH9K_DEBUG is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BR_FUSE is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+# CONFIG_AUFS_DEBUG is not set
+# CONFIG_AUFS_EXPORT is not set
+CONFIG_AUFS_FS=m
+# CONFIG_AUFS_HINOTIFY is not set
+# CONFIG_AUFS_RDU is not set
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_SP_IATTR is not set
+# CONFIG_B3DFG is not set
+CONFIG_BT_L2CAP_EXT_FEATURES=y
+# CONFIG_DEBUG_CFQ_IOSCHED is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DST is not set
+# CONFIG_DT3155 is not set
+CONFIG_DVB_LGDT3304=m
+# CONFIG_FORCEDETH_NAPI is not set
+# CONFIG_HW_BRANCH_TRACER is not set
+# CONFIG_IEEE1394 is not set
+CONFIG_INOTIFY=y
+# CONFIG_INPUT_GPIO is not set
# CONFIG_INPUT_MIMIO is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
+# CONFIG_KMEMTRACE is not set
CONFIG_LBD=y
+# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+# CONFIG_OTUS is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCMCIA_IOCTL is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_POCH is not set
+# CONFIG_POWER_TRACER is not set
+CONFIG_QT2160=m
+CONFIG_RPCSEC_GSS_SPKM3=m
+# CONFIG_RTL8187SE is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
+# CONFIG_SECURITY_ROOTPLUG is not set
+CONFIG_SENSORS_ADT7473=m
+# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_SYSPROF_TRACER is not set
+CONFIG_TIPC_SLAVE_NODES=0
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+CONFIG_UWB_I1480U_WLP=m
+CONFIG_UWB_WLP=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_WORKQUEUE_TRACER is not set
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -342,12 +342,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-# CONFIG_STRIP is not set
-# CONFIG_WAVELAN is not set
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
CONFIG_PCMCIA_RAYCS=m
# CONFIG_ATMEL is not set
CONFIG_AIRO_CS=m
@@ -396,7 +390,6 @@
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
CONFIG_CARDBUS=y
CONFIG_YENTA=m
@@ -404,6 +397,7 @@
CONFIG_I82092=m
CONFIG_I82365=m
# CONFIG_TCIC is not set
+# CONFIG_PCMCIA_DEBUG is not set
##
## file: drivers/pnp/Kconfig
@@ -686,7 +680,6 @@
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set
# CONFIG_SND_WAVEFRONT is not set
@@ -746,4 +739,11 @@
## file: unknown
##
CONFIG_MOUSE_HIL=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc Tue Feb 8 19:08:41 2011 (r16865)
@@ -15,11 +15,6 @@
CONFIG_TLAN=m
##
-## file: drivers/net/wireless/Kconfig
-##
-# CONFIG_ARLAN is not set
-
-##
## file: drivers/scsi/Kconfig
##
# CONFIG_SCSI_DPT_I2O is not set
@@ -31,3 +26,8 @@
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_NINJA_SCSI=m
+##
+## file: unknown
+##
+# CONFIG_ARLAN is not set
+
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp Tue Feb 8 19:08:41 2011 (r16865)
@@ -15,11 +15,6 @@
CONFIG_TLAN=m
##
-## file: drivers/net/wireless/Kconfig
-##
-# CONFIG_ARLAN is not set
-
-##
## file: drivers/scsi/Kconfig
##
# CONFIG_SCSI_DPT_I2O is not set
@@ -31,3 +26,8 @@
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_NINJA_SCSI=m
+##
+## file: unknown
+##
+# CONFIG_ARLAN is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.486 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.486 Tue Feb 8 19:08:41 2011 (r16865)
@@ -54,11 +54,6 @@
# CONFIG_MCA_PROC_FS is not set
##
-## file: drivers/media/video/Kconfig
-##
-CONFIG_USB_W9968CF=m
-
-##
## file: drivers/mtd/chips/Kconfig
##
# CONFIG_MTD_XIP is not set
@@ -116,3 +111,8 @@
##
CONFIG_FB_GEODE_LX=y
+##
+## file: unknown
+##
+CONFIG_USB_W9968CF=m
+
Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686 Tue Feb 8 19:08:41 2011 (r16865)
@@ -27,11 +27,6 @@
CONFIG_I2C_STUB=m
##
-## file: drivers/media/video/Kconfig
-##
-# CONFIG_USB_W9968CF is not set
-
-##
## file: drivers/net/Kconfig
##
# CONFIG_NI5010 is not set
@@ -51,3 +46,8 @@
##
# CONFIG_DEBUG_HIGHMEM is not set
+##
+## file: unknown
+##
+# CONFIG_USB_W9968CF is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem Tue Feb 8 19:08:41 2011 (r16865)
@@ -34,11 +34,6 @@
CONFIG_I2C_STUB=m
##
-## file: drivers/media/video/Kconfig
-##
-# CONFIG_USB_W9968CF is not set
-
-##
## file: drivers/net/Kconfig
##
# CONFIG_NI5010 is not set
@@ -58,3 +53,8 @@
##
# CONFIG_DEBUG_HIGHMEM is not set
+##
+## file: unknown
+##
+# CONFIG_USB_W9968CF is not set
+
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -3,21 +3,17 @@
##
CONFIG_OPROFILE=m
CONFIG_KPROBES=y
-CONFIG_KRETPROBES=y
##
## file: arch/ia64/Kconfig
##
-CONFIG_IA64_UNCACHED_ALLOCATOR=y
CONFIG_HOTPLUG_CPU=y
CONFIG_SCHED_SMT=y
CONFIG_PERMIT_BSP_REMOVE=y
CONFIG_NODES_SHIFT=8
-CONFIG_IA32_SUPPORT=y
CONFIG_IA64_MCA_RECOVERY=m
CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=m
-CONFIG_SGI_SN=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_MSPEC=m
@@ -62,18 +58,18 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
+CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
##
## file: drivers/block/Kconfig
@@ -218,7 +214,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -239,7 +234,6 @@
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_VOODOO3=m
CONFIG_I2C_PCA_ISA=m
CONFIG_I2C_STUB=m
CONFIG_SCx200_ACB=m
@@ -278,18 +272,6 @@
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
-## file: drivers/ieee1394/Kconfig
-##
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
-
-##
## file: drivers/input/gameport/Kconfig
##
CONFIG_GAMEPORT=m
@@ -525,11 +507,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
CONFIG_PCMCIA_RAYCS=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -836,3 +813,23 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
+CONFIG_IA32_SUPPORT=y
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -4,12 +4,10 @@
CONFIG_OPROFILE=m
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_KPROBES=y
-CONFIG_KRETPROBES=y
##
## file: arch/x86/Kconfig
##
-CONFIG_SPARSE_IRQ=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -19,7 +17,6 @@
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_SPINLOCKS is not set
# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_NO_BOOTMEM is not set
# CONFIG_MEMTEST is not set
CONFIG_HPET_TIMER=y
CONFIG_SCHED_SMT=y
@@ -64,11 +61,6 @@
CONFIG_IA32_AOUT=y
##
-## file: arch/x86/Kconfig.cpu
-##
-CONFIG_X86_PTRACE_BTS=y
-
-##
## file: arch/x86/Kconfig.debug
##
CONFIG_STRICT_DEVMEM=y
@@ -83,6 +75,7 @@
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
+# CONFIG_X86_DECODER_SELFTEST is not set
## choice: IO delay type
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
@@ -92,7 +85,6 @@
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_X86_DECODER_SELFTEST is not set
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
##
@@ -130,7 +122,6 @@
CONFIG_ACPI_PROCFS=y
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_EC_DEBUGFS is not set
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
@@ -149,6 +140,10 @@
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
+
+##
+## file: drivers/acpi/apei/Kconfig
+##
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
# CONFIG_ACPI_APEI_EINJ is not set
@@ -164,20 +159,20 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RZ1000=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
+CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
##
## file: drivers/atm/Kconfig
@@ -418,8 +413,8 @@
##
## file: drivers/gpu/vga/Kconfig
##
-CONFIG_VGA_SWITCHEROO=y
CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
##
## file: drivers/hid/usbhid/Kconfig
@@ -464,7 +459,6 @@
CONFIG_SENSORS_W83781D=m
CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_HDAPS=m
##
## file: drivers/i2c/Kconfig
@@ -474,7 +468,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -496,7 +489,6 @@
CONFIG_I2C_SCMI=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_VOODOO3=m
CONFIG_I2C_PCA_ISA=m
CONFIG_SCx200_ACB=m
@@ -541,14 +533,14 @@
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
-## file: drivers/input/Kconfig
+## file: drivers/idle/Kconfig
##
-CONFIG_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INTEL_IDLE is not set
##
-## file: drivers/idle/Kconfig
+## file: drivers/input/Kconfig
##
-# CONFIG_INTEL_IDLE is not set
+CONFIG_XEN_KBDDEV_FRONTEND=y
##
## file: drivers/input/gameport/Kconfig
@@ -691,7 +683,6 @@
CONFIG_PHANTOM=m
CONFIG_CS5535_MFGPT=m
CONFIG_HP_ILO=m
-CONFIG_DELL_LAPTOP=m
##
## file: drivers/mmc/Kconfig
@@ -918,11 +909,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
CONFIG_PCMCIA_RAYCS=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -960,13 +946,13 @@
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
CONFIG_CARDBUS=y
CONFIG_YENTA=m
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_TCIC=m
+# CONFIG_PCMCIA_DEBUG is not set
##
## file: drivers/platform/x86/Kconfig
@@ -974,6 +960,7 @@
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
+CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_SONYPI_COMPAT=y
CONFIG_IDEAPAD_LAPTOP=m
@@ -984,11 +971,12 @@
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
CONFIG_THINKPAD_ACPI_VIDEO=y
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
# CONFIG_INTEL_MENLOW is not set
CONFIG_EEEPC_LAPTOP=m
CONFIG_EEEPC_WMI=m
-CONFIG_MSI_WMI=m
CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
CONFIG_ACPI_ASUS=m
CONFIG_TOPSTAR_LAPTOP=m
CONFIG_ACPI_TOSHIBA=m
@@ -1081,10 +1069,12 @@
CONFIG_SFI=y
##
-## file: drivers/staging/brcm0211/Kconfig
+## file: drivers/staging/brcm80211/Kconfig
##
CONFIG_BRCM80211=m
+## choice: Broadcom IEEE802.11n driver style
CONFIG_BRCM80211_PCI=y
+## end choice
##
## file: drivers/staging/comedi/Kconfig
@@ -1174,7 +1164,6 @@
## file: drivers/staging/zram/Kconfig
##
CONFIG_ZRAM=m
-CONFIG_ZRAM_STATS=y
##
## file: drivers/telephony/Kconfig
@@ -1351,6 +1340,11 @@
CONFIG_EFI_PARTITION=y
##
+## file: kernel/irq/Kconfig
+##
+CONFIG_SPARSE_IRQ=y
+
+##
## file: kernel/power/Kconfig
##
# CONFIG_PM_TRACE_RTC is not set
@@ -1516,7 +1510,17 @@
##
## file: unknown
##
+CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
# CONFIG_KVM_TRACE is not set
CONFIG_NUMA_MIGRATE_IRQ_DESC=y
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_PTRACE_BTS=y
+CONFIG_ZRAM_STATS=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 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Tue Feb 8 19:08:41 2011 (r16865)
@@ -3,9 +3,7 @@
##
# CONFIG_64BIT is not set
CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
CONFIG_X86_BIGSMP=y
-CONFIG_VMI=y
CONFIG_NR_CPUS=32
CONFIG_VM86=y
CONFIG_TOSHIBA=m
@@ -69,11 +67,6 @@
CONFIG_LGUEST_GUEST=y
##
-## file: arch/x86/xen/Kconfig
-##
-CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-
-##
## file: crypto/Kconfig
##
CONFIG_CRYPTO_AES_586=m
@@ -115,7 +108,6 @@
##
## file: drivers/char/Kconfig
##
-# CONFIG_ESPSERIAL is not set
# CONFIG_ISI is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SPECIALIX is not set
@@ -295,12 +287,6 @@
CONFIG_SDLA=m
##
-## file: drivers/net/wireless/Kconfig
-##
-CONFIG_ARLAN=m
-CONFIG_WAVELAN=m
-
-##
## file: drivers/net/wireless/ipw2x00/Kconfig
##
CONFIG_IPW2100=m
@@ -407,6 +393,11 @@
CONFIG_BINFMT_AOUT=m
##
+## file: kernel/irq/Kconfig
+##
+# CONFIG_SPARSE_IRQ is not set
+
+##
## file: lib/Kconfig.debug
##
CONFIG_FRAME_WARN=1024
@@ -439,8 +430,6 @@
CONFIG_SND_CMI8330=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
CONFIG_SND_ES1688=m
CONFIG_SND_ES18XX=m
CONFIG_SND_SC6000=m
@@ -459,7 +448,6 @@
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SGALAXY=m
CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m
CONFIG_SND_MSND_PINNACLE=m
@@ -473,7 +461,14 @@
##
## file: unknown
##
+CONFIG_ARLAN=m
+# CONFIG_ESPSERIAL is not set
CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_SND_DT019X=m
+CONFIG_SND_ES968=m
+CONFIG_SND_SGALAXY=m
+CONFIG_VMI=y
+CONFIG_WAVELAN=m
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 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64 Tue Feb 8 19:08:41 2011 (r16865)
@@ -33,11 +33,6 @@
CONFIG_X86_POWERNOW_K8=m
##
-## file: arch/x86/xen/Kconfig
-##
-CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-
-##
## file: crypto/Kconfig
##
CONFIG_CRYPTO_AES_X86_64=m
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac Tue Feb 8 19:08:41 2011 (r16865)
@@ -18,7 +18,6 @@
CONFIG_M68KFPU_EMU_EXTRAPREC=y
# CONFIG_M68KFPU_EMU_ONLY is not set
# CONFIG_HEARTBEAT is not set
-CONFIG_MAC_SCC=y
CONFIG_SERIAL_CONSOLE=y
##
@@ -195,3 +194,8 @@
##
# CONFIG_SOUND is not set
+##
+## file: unknown
+##
+CONFIG_MAC_SCC=y
+
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Tue Feb 8 19:08:41 2011 (r16865)
@@ -7,7 +7,6 @@
## file: arch/mips/Kconfig
##
## choice: System type
-# CONFIG_BASLER_EXCITE is not set
# CONFIG_MIPS_COBALT is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -119,30 +118,30 @@
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+CONFIG_SATA_SX4=y
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
CONFIG_PATA_CMD64X=y
-CONFIG_ATA_GENERIC=y
CONFIG_PATA_HPT366=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_PDC_OLD=y
CONFIG_PATA_SIL680=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_ATA_GENERIC=y
##
## file: drivers/atm/Kconfig
@@ -334,7 +333,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -355,7 +353,6 @@
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_VOODOO3=m
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_STUB is not set
@@ -588,9 +585,9 @@
##
## file: drivers/mtd/nand/Kconfig
##
+# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=m
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_DISKONCHIP=m
# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
@@ -722,9 +719,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WLAN_80211=y
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_USB_ZD1201=m
@@ -1122,11 +1116,17 @@
CONFIG_WAN_ROUTER=m
##
-## file: net/wireless/Kconfig
+## file: net/x25/Kconfig
##
-CONFIG_WIRELESS_EXT=y
+CONFIG_X25=m
##
-## file: net/x25/Kconfig
+## file: unknown
##
-CONFIG_X25=m
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Tue Feb 8 19:08:41 2011 (r16865)
@@ -7,8 +7,6 @@
## file: arch/mips/Kconfig
##
## choice: System type
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_BASLER_EXCITE is not set
# CONFIG_MIPS_COBALT is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -103,32 +101,32 @@
##
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
+CONFIG_SATA_INIC162X=m
CONFIG_SATA_SIL24=y
-# CONFIG_SATA_SVW is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+CONFIG_SATA_SX4=y
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-CONFIG_SATA_INIC162X=m
CONFIG_PATA_CMD64X=y
-CONFIG_ATA_GENERIC=y
CONFIG_PATA_HPT366=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_PDC_OLD=y
CONFIG_PATA_SIL680=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_ATA_GENERIC=y
##
## file: drivers/atm/Kconfig
@@ -322,7 +320,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -345,7 +342,6 @@
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VOODOO3=m
# CONFIG_I2C_STUB is not set
##
@@ -354,11 +350,6 @@
# CONFIG_IDE is not set
##
-## file: drivers/ieee1394/Kconfig
-##
-# CONFIG_IEEE1394 is not set
-
-##
## file: drivers/input/gameport/Kconfig
##
CONFIG_GAMEPORT=m
@@ -600,9 +591,9 @@
##
## file: drivers/mtd/nand/Kconfig
##
+# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=m
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
CONFIG_MTD_NAND_DISKONCHIP=m
# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
@@ -762,12 +753,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WLAN_80211=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_USB_ZD1201=m
@@ -784,6 +769,13 @@
# CONFIG_IPW2200_DEBUG is not set
##
+## file: drivers/net/wireless/libertas/Kconfig
+##
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
+
+##
## file: drivers/net/wireless/orinoco/Kconfig
##
CONFIG_HERMES=m
@@ -1185,11 +1177,19 @@
CONFIG_WAN_ROUTER=m
##
-## file: net/wireless/Kconfig
+## file: net/x25/Kconfig
##
-CONFIG_WIRELESS_EXT=y
+CONFIG_X25=m
##
-## file: net/x25/Kconfig
+## file: unknown
##
-CONFIG_X25=m
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
+# CONFIG_IEEE1394 is not set
+# CONFIG_MACH_ALCHEMY is not set
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,14 +1,18 @@
##
## file: arch/mips/Kconfig
##
+## choice: System type
CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
+## end choice
+## choice: Kernel code model
# CONFIG_32BIT is not set
CONFIG_64BIT=y
+## end choice
CONFIG_SMP=y
+CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_PCI=y
##
## file: arch/mips/cavium-octeon/Kconfig
@@ -83,14 +87,6 @@
CONFIG_RTC_DRV_DS1307=y
##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-
-##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI=y
@@ -101,15 +97,18 @@
##
CONFIG_MEGARAID_SAS=y
-##
-## file: drivers/staging/octeon/Kconfig
##
-CONFIG_OCTEON_ETHERNET=m
+## file: drivers/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
##
-## file: mm/Kconfig
+## file: drivers/staging/octeon/Kconfig
##
-CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_OCTEON_ETHERNET=m
##
## file: fs/ext2/Kconfig
@@ -121,3 +120,10 @@
##
CONFIG_EXT3_FS=y
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_SPARSEMEM_MANUAL=y
+## end choice
+
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Tue Feb 8 19:08:41 2011 (r16865)
@@ -184,7 +184,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -280,11 +279,7 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
CONFIG_VIDEO_VINO=m
-# CONFIG_VIDEO_OVCAMCHIP is not set
##
## file: drivers/message/fusion/Kconfig
@@ -414,6 +409,11 @@
CONFIG_SPI_BUTTERFLY=m
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -553,6 +553,10 @@
##
## file: unknown
##
+# CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 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 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Tue Feb 8 19:08:41 2011 (r16865)
@@ -198,7 +198,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -218,7 +217,6 @@
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_STUB is not set
# CONFIG_SCx200_ACB is not set
@@ -302,14 +300,9 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -491,6 +484,16 @@
CONFIG_SPI_BUTTERFLY=m
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
+## file: drivers/staging/stradis/Kconfig
+##
+# CONFIG_VIDEO_STRADIS is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -677,7 +680,12 @@
##
## file: unknown
##
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
CONFIG_INPUT_SGIO2_BTNS=m
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 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 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Tue Feb 8 19:08:41 2011 (r16865)
@@ -123,16 +123,16 @@
CONFIG_ATA=y
CONFIG_SATA_AHCI=m
CONFIG_SATA_SIL24=m
-CONFIG_SATA_SVW=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
@@ -239,7 +239,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -259,7 +258,6 @@
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
CONFIG_I2C_SIBYTE=m
CONFIG_I2C_STUB=m
@@ -344,18 +342,10 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
-# CONFIG_USB_STV680 is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -581,6 +571,16 @@
CONFIG_SPI_BUTTERFLY=m
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
+## file: drivers/staging/stradis/Kconfig
+##
+# CONFIG_VIDEO_STRADIS is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -765,9 +765,17 @@
## file: unknown
##
CONFIG_BLK_DEV_IDE_SWARM=y
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 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 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Tue Feb 8 19:08:41 2011 (r16865)
@@ -123,16 +123,16 @@
CONFIG_ATA=y
CONFIG_SATA_AHCI=m
CONFIG_SATA_SIL24=m
-CONFIG_SATA_SVW=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
@@ -142,17 +142,17 @@
CONFIG_PATA_CS5530=m
CONFIG_PATA_CYPRESS=y
CONFIG_PATA_EFAR=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_PLATFORM=y
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
+CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_PLATFORM=y
##
## file: drivers/block/Kconfig
@@ -261,7 +261,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -281,7 +280,6 @@
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
CONFIG_I2C_SIBYTE=m
CONFIG_I2C_STUB=m
@@ -366,18 +364,10 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
-# CONFIG_USB_STV680 is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -603,6 +593,16 @@
CONFIG_SPI_BUTTERFLY=m
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
+## file: drivers/staging/stradis/Kconfig
+##
+# CONFIG_VIDEO_STRADIS is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -787,9 +787,17 @@
## file: unknown
##
# CONFIG_BLK_DEV_IDE_SWARM is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,27 +1,30 @@
##
## file: arch/mips/Kconfig
##
+## choice: System type
CONFIG_MACH_LOONGSON=y
+## end choice
+## choice: Kernel code model
# CONFIG_32BIT is not set
CONFIG_64BIT=y
+## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
##
-## file: arch/mips/loongson/Kconfig
+## file: arch/mips/kernel/cpufreq/Kconfig
##
-CONFIG_LEMOTE_MACH2F=y
-CONFIG_CS5536_MFGPT=y
-CONFIG_LOONGSON_UART_BASE=y
-CONFIG_LOONGSON_MC146818=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_LOONGSON2_CPUFREQ=m
##
-## file: arch/mips/kernel/cpufreq/Kconfig
+## file: arch/mips/loongson/Kconfig
##
-CONFIG_LOONGSON2_CPUFREQ=m
+## choice: Machine Type
+CONFIG_LEMOTE_MACH2F=y
+## end choice
+CONFIG_CS5536_MFGPT=y
##
## file: drivers/ata/Kconfig
@@ -124,3 +127,4 @@
## file: fs/ext3/Kconfig
##
CONFIG_EXT3_FS=y
+
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Tue Feb 8 19:08:41 2011 (r16865)
@@ -92,8 +92,8 @@
## file: drivers/ata/Kconfig
##
CONFIG_ATA=y
-CONFIG_PATA_PLATFORM=y
CONFIG_PATA_VIA=y
+CONFIG_PATA_PLATFORM=y
##
## file: drivers/base/Kconfig
@@ -291,15 +291,10 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
-# CONFIG_USB_STV680 is not set
##
## file: drivers/media/video/et61x251/Kconfig
@@ -520,9 +515,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-# CONFIG_STRIP is not set
-CONFIG_WLAN_80211=y
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_USB_ZD1201=m
@@ -592,6 +584,16 @@
# CONFIG_SPI_BUTTERFLY is not set
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
+## file: drivers/staging/stradis/Kconfig
+##
+# CONFIG_VIDEO_STRADIS is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -778,4 +780,10 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_STRIP is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -3,14 +3,12 @@
##
CONFIG_OPROFILE=m
CONFIG_KPROBES=y
-CONFIG_KRETPROBES=y
##
## file: arch/powerpc/Kconfig
##
# CONFIG_HOTPLUG_CPU is not set
CONFIG_KEXEC=y
-CONFIG_PROC_DEVICETREE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
CONFIG_SECCOMP=y
@@ -79,7 +77,7 @@
CONFIG_PROC_PREPRESIDUAL=y
##
-## file: drivers/ata/config
+## file: drivers/ata/Kconfig
##
CONFIG_PATA_PCMCIA=m
@@ -242,7 +240,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -264,7 +261,6 @@
CONFIG_I2C_POWERMAC=m
CONFIG_I2C_MPC=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_VOODOO3=m
CONFIG_I2C_PCA_ISA=m
# CONFIG_I2C_STUB is not set
CONFIG_SCx200_ACB=m
@@ -596,11 +592,6 @@
##
## file: drivers/net/wireless/Kconfig
##
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
CONFIG_PCMCIA_RAYCS=m
CONFIG_ATMEL=m
# CONFIG_PCI_ATMEL is not set
@@ -625,6 +616,11 @@
CONFIG_PCMCIA_HERMES=m
##
+## file: drivers/of/Kconfig
+##
+CONFIG_PROC_DEVICETREE=y
+
+##
## file: drivers/pci/hotplug/Kconfig
##
# CONFIG_HOTPLUG_PCI is not set
@@ -633,13 +629,13 @@
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
CONFIG_CARDBUS=y
CONFIG_YENTA=m
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_TCIC=m
+# CONFIG_PCMCIA_DEBUG is not set
##
## file: drivers/power/Kconfig
@@ -989,3 +985,14 @@
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
+##
+## file: unknown
+##
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_VOODOO3=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_WLAN_PRE80211=y
+
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Tue Feb 8 19:08:41 2011 (r16865)
@@ -58,7 +58,7 @@
CONFIG_MAC_FLOPPY=y
##
-## file: drivers/hwmon/Kconfig
+## file: drivers/macintosh/Kconfig
##
CONFIG_SENSORS_AMS=m
CONFIG_SENSORS_AMS_PMU=y
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,7 +1,6 @@
##
## file: arch/powerpc/Kconfig
##
-CONFIG_IOMMU_VMERGE=y
# CONFIG_CRASH_DUMP is not set
CONFIG_IRQ_ALL_CPUS=y
CONFIG_NUMA=y
@@ -13,11 +12,6 @@
CONFIG_KERNEL_START=0xc000000000000000
##
-## file: arch/powerpc/Kconfig.debug
-##
-# CONFIG_IRQSTACKS is not set
-
-##
## file: arch/powerpc/platforms/Kconfig
##
CONFIG_RTAS_PROC=y
@@ -205,3 +199,9 @@
CONFIG_SND_PS3=m
CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
+##
+## file: unknown
+##
+CONFIG_IOMMU_VMERGE=y
+# CONFIG_IRQSTACKS is not set
+
Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/s390/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -6,7 +6,6 @@
CONFIG_HOTPLUG_CPU=y
CONFIG_MATHEMU=y
CONFIG_COMPAT=y
-CONFIG_S390_SWITCH_AMODE=y
CONFIG_S390_EXEC_PROTECT=y
CONFIG_PACK_STACK=y
# CONFIG_SMALL_STACK is not set
@@ -14,11 +13,9 @@
# CONFIG_WARN_STACK is not set
CONFIG_QDIO=y
CONFIG_IPL=y
-# CONFIG_PROCESS_DEBUG is not set
CONFIG_PFAULT=y
# CONFIG_SHARED_KERNEL is not set
CONFIG_CMM=y
-CONFIG_CMM_PROC=y
CONFIG_CMM_IUCV=y
CONFIG_APPLDATA_BASE=y
CONFIG_APPLDATA_MEM=m
@@ -194,3 +191,10 @@
##
# CONFIG_WAN_ROUTER is not set
+##
+## file: unknown
+##
+CONFIG_CMM_PROC=y
+# CONFIG_PROCESS_DEBUG is not set
+CONFIG_S390_SWITCH_AMODE=y
+
Modified: dists/trunk/linux-2.6/debian/config/sh4/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/sh4/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,50 +1,56 @@
-CONFIG_SUPERH=y
-CONFIG_SUPERH32=y
+##
+## file: arch/sh/Kconfig
+##
+CONFIG_SH_CPU_FREQ=y
+CONFIG_KEXEC=y
+CONFIG_SECCOMP=y
CONFIG_VIRTUALIZATION=y
-#
-# System type
-#
-CONFIG_CPU_SH4=y
-
-#
-# Cache configuration
-#
-CONFIG_CACHE_WRITEBACK=y
-
-#
-# Processor features
-#
+##
+## file: arch/sh/Kconfig.cpu
+##
+## choice: Endianess selection
CONFIG_CPU_LITTLE_ENDIAN=y
+## end choice
CONFIG_SH_FPU=y
CONFIG_SH_STORE_QUEUES=y
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-CONFIG_CPU_HAS_FPU=y
-
-#
-# CPU Frequency scaling
-#
+
+##
+## file: arch/sh/drivers/Kconfig
+##
+CONFIG_HEARTBEAT=y
+
+##
+## file: arch/sh/mm/Kconfig
+##
+## choice: Cache mode
+CONFIG_CACHE_WRITEBACK=y
+## end choice
+
+##
+## file: drivers/cpufreq/Kconfig
+##
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_SH_CPU_FREQ=y
-
-#
-# Additional SuperH Device Drivers
-#
-CONFIG_HEARTBEAT=y
-#
-# Kernel features
-#
+##
+## file: kernel/Kconfig.hz
+##
+## choice: Timer frequency
CONFIG_HZ_250=y
-CONFIG_HZ=250
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-CONFIG_SECCOMP=y
-CONFIG_PREEMPT_NONE=y
-CONFIG_GUSA=y
+## end choice
+
+##
+## file: kernel/irq/Kconfig
+##
CONFIG_SPARSE_IRQ=y
+
+##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+CONFIG_PREEMPT_NONE=y
+## end choice
+
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,266 +1,214 @@
-#
-# System type
-#
+##
+## file: arch/sh/Kconfig
+##
+## choice: Processor sub-type selection
CONFIG_CPU_SUBTYPE_SH7751R=y
+## end choice
+CONFIG_SH_TIMER_TMU=y
+CONFIG_SH_PCLK_FREQ=60000000
+CONFIG_PCI=y
+
+##
+## file: arch/sh/boards/Kconfig
+##
+CONFIG_SH_RTS7751R2D=y
+
+##
+## file: arch/sh/boards/mach-r2d/Kconfig
+##
+CONFIG_RTS7751R2D_PLUS=y
+CONFIG_RTS7751R2D_1=y
+
+##
+## file: arch/sh/Kconfig.cpu
+##
+## choice: Endianess selection
+CONFIG_CPU_LITTLE_ENDIAN=y
+## end choice
+CONFIG_SH_FPU=y
-#
-# Memory management options
-#
-CONFIG_QUICKLIST=y
+##
+## file: arch/sh/mm/Kconfig
+##
CONFIG_MMU=y
-CONFIG_PAGE_OFFSET=0x80000000
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_MEMORY_START=0x0c000000
CONFIG_MEMORY_SIZE=0x04000000
-CONFIG_29BIT=y
CONFIG_VSYSCALL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_MAX_ACTIVE_REGIONS=1
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+## choice: Kernel page size
CONFIG_PAGE_SIZE_4KB=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=2
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+## end choice
-#
-# Processor features
-#
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SH_FPU=y
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-CONFIG_CPU_HAS_FPU=y
-
-#
-# Board support
-#
-CONFIG_SH_RTS7751R2D=y
+##
+## file: drivers/ata/Kconfig
+##
+CONFIG_ATA=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+CONFIG_PATA_PLATFORM=y
-#
-# RTS7751R2D Board Revision
-#
-CONFIG_RTS7751R2D_PLUS=y
-CONFIG_RTS7751R2D_1=y
+##
+## file: drivers/char/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
-#
-# Timer and clock configuration
-#
-CONFIG_SH_TIMER_TMU=y
-CONFIG_SH_PCLK_FREQ=60000000
-CONFIG_SH_CLK_CPG=y
-CONFIG_SH_CLK_CPG_LEGACY=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+##
+## file: drivers/hid/Kconfig
+##
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
-#
-# Boot options
-#
-CONFIG_ZERO_PAGE_OFFSET=0x00010000
-CONFIG_BOOT_LINK_OFFSET=0x009e0000
-CONFIG_ENTRY_OFFSET=0x00001000
-
-#
-# Bus options
-#
-CONFIG_PCI=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
+##
+## file: drivers/hid/usbhid/Kconfig
+##
+CONFIG_USB_HID=y
+
+##
+## file: drivers/input/Kconfig
+##
+CONFIG_INPUT=y
-#
-# Generic Driver Options
-#
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_INPUT_KEYBOARD=y
+
+##
+## file: drivers/mfd/Kconfig
+##
+CONFIG_MFD_SM501=y
+
+##
+## file: drivers/mtd/Kconfig
+##
CONFIG_MTD=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
-
-#
-# User Modules And Translation Layers
-#
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
-#
-# RAM/ROM/Flash chip drivers
-#
+##
+## file: drivers/mtd/chips/Kconfig
+##
CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-#
-# Mapping drivers for chip access
-#
+##
+## file: drivers/mtd/maps/Kconfig
+##
CONFIG_MTD_PHYSMAP=y
-#
-# UBI - Unsorted block images
-#
-CONFIG_HAVE_IDE=y
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-
-#
-# SCSI Transports
-#
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-CONFIG_ATA_SFF=y
-CONFIG_PATA_PLATFORM=y
-
-# net device
-
+##
+## file: drivers/net/Kconfig
+##
CONFIG_NETDEVICES=y
CONFIG_MII=y
CONFIG_NET_ETHERNET=y
CONFIG_NET_PCI=y
CONFIG_8139CP=y
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_DRV_R9701=y
+# CONFIG_RTC_DRV_SH is not set
+# CONFIG_RTC_DRV_GENERIC is not set
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
-#
-# Non-8250 serial port support
-#
+##
+## file: drivers/serial/Kconfig
+##
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_DEVPORT=y
-
-#
-# SPI Master Controller Drivers
-#
+
+##
+## file: drivers/spi/Kconfig
+##
CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
CONFIG_SPI_BITBANG=y
CONFIG_SPI_SH_SCI=y
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_SM501=y
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB_SUPPORT=y
+CONFIG_USB=y
+
+##
+## file: drivers/usb/core/Kconfig
+##
+CONFIG_USB_DEVICE_CLASS=y
-#
-# Graphics support
-#
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_OHCI_HCD=y
+
+##
+## file: drivers/video/Kconfig
+##
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-
-#
-# Frame buffer hardware drivers
-#
CONFIG_FB_SM501=y
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
+##
+## file: drivers/video/console/Kconfig
+##
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+
+##
+## file: drivers/video/logo/Kconfig
+##
CONFIG_LOGO=y
CONFIG_LOGO_SUPERH_MONO=y
CONFIG_LOGO_SUPERH_VGA16=y
CONFIG_LOGO_SUPERH_CLUT224=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-
-#
-# USB Host
-#
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICE_CLASS=y
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-#
-# RTC
-#
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+##
+## file: fs/ext3/Kconfig
+##
+CONFIG_EXT3_FS=y
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
+##
+## file: kernel/time/Kconfig
+##
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_R9701=y
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_FLATMEM_MANUAL=y
+## end choice
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_SH is not set
-# CONFIG_RTC_DRV_GENERIC is not set
+##
+## file: unknown
+##
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
-#
-# File systems
-#
-CONFIG_EXT3_FS=y
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Tue Feb 8 19:08:41 2011 (r16865)
@@ -1,172 +1,113 @@
-#
-# System type
-#
-CONFIG_CPU_SH4A=y
-CONFIG_CPU_SHX2=y
+##
+## file: arch/sh/Kconfig
+##
+## choice: Processor sub-type selection
CONFIG_CPU_SUBTYPE_SH7785=y
+## end choice
+CONFIG_SH_TIMER_TMU=y
+CONFIG_SH_PCLK_FREQ=50000000
+CONFIG_PCI=y
-#
-# Memory management options
-#
-CONFIG_QUICKLIST=y
+##
+## file: arch/sh/boards/Kconfig
+##
+CONFIG_SH_SH7785LCR=y
+
+##
+## file: arch/sh/Kconfig.cpu
+##
+## choice: Endianess selection
+CONFIG_CPU_LITTLE_ENDIAN=y
+## end choice
+CONFIG_SH_FPU=y
+CONFIG_SH_STORE_QUEUES=y
+
+##
+## file: arch/sh/mm/Kconfig
+##
CONFIG_MMU=y
-CONFIG_PAGE_OFFSET=0x80000000
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_MEMORY_START=0x48000000
CONFIG_MEMORY_SIZE=0x18000000
-CONFIG_32BIT=y
-CONFIG_PMB_ENABLE=y
-CONFIG_PMB_FIXED=y
CONFIG_VSYSCALL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_MAX_ACTIVE_REGIONS=2
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+## choice: Kernel page size
CONFIG_PAGE_SIZE_4KB=y
+## end choice
+## choice: HugeTLB page size
CONFIG_HUGETLB_PAGE_SIZE_64K=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=2
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-
-#
-# Processor features
-#
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SH_FPU=y
-CONFIG_SH_STORE_QUEUES=y
-CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_SR_RB=y
-CONFIG_CPU_HAS_FPU=y
-
-#
-# Board support
-#
-CONFIG_SH_SH7785LCR=y
-
-#
-# Timer and clock configuration
-#
-CONFIG_SH_TIMER_TMU=y
-CONFIG_SH_PCLK_FREQ=50000000
-CONFIG_SH_CLK_CPG=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-
-#
-# Boot options
-#
-CONFIG_ZERO_PAGE_OFFSET=0x00001000
-CONFIG_BOOT_LINK_OFFSET=0x00800000
-CONFIG_ENTRY_OFFSET=0x00001000
-
-#
-# Bus options
-#
-CONFIG_PCI=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
+## end choice
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_PHYSMAP=y
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_HAVE_IDE=y
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-
-#
-# SCSI Transports
-#
+##
+## file: drivers/ata/Kconfig
+##
CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_SATA_PMP=y
CONFIG_ATA_SFF=y
CONFIG_SATA_SIL=y
-# net device
+##
+## file: drivers/char/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NETDEV_1000=y
-CONFIG_R8169=y
+##
+## file: drivers/dma/Kconfig
+##
+CONFIG_DMADEVICES=y
-#
-# Input device support
-#
-CONFIG_INPUT=y
+##
+## file: drivers/hid/Kconfig
+##
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
-#
-# Userland interfaces
-#
+##
+## file: drivers/hid/usbhid/Kconfig
+##
+CONFIG_USB_HID=y
+
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_HELPER_AUTO=y
+
+##
+## file: drivers/i2c/algos/Kconfig
+##
+CONFIG_I2C_ALGOPCA=y
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_PCA_PLATFORM=y
+
+##
+## file: drivers/input/Kconfig
+##
+CONFIG_INPUT=y
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_EVDEV=y
-#
-# Input Device Drivers
-#
+##
+## file: drivers/input/keyboard/Kconfig
+##
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
+
+##
+## file: drivers/input/mouse/Kconfig
+##
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
@@ -174,151 +115,155 @@
CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
-#
-# Hardware I/O ports
-#
+##
+## file: drivers/input/serio/Kconfig
+##
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
+##
+## file: drivers/mfd/Kconfig
+##
+CONFIG_MFD_SM501=y
+
+##
+## file: drivers/mtd/Kconfig
+##
+CONFIG_MTD=y
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+
+##
+## file: drivers/mtd/chips/Kconfig
+##
+CONFIG_MTD_CFI=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_AMDSTD=y
+
+##
+## file: drivers/mtd/maps/Kconfig
+##
+CONFIG_MTD_PHYSMAP=y
+
+##
+## file: drivers/net/Kconfig
+##
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NETDEV_1000=y
+CONFIG_R8169=y
+
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_DRV_RS5C372=y
+# CONFIG_RTC_DRV_SH is not set
+# CONFIG_RTC_DRV_GENERIC is not set
-#
-# Non-8250 serial port support
-#
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+
+##
+## file: drivers/serial/Kconfig
+##
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DEVPORT=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOPCA=y
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_PLATFORM=y
-
-#
-# PPS support
-#
-CONFIG_WATCHDOG=y
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB_SUPPORT=y
+CONFIG_USB=y
-#
-# Watchdog Device Drivers
-#
-CONFIG_SH_WDT=y
+##
+## file: drivers/usb/core/Kconfig
+##
+CONFIG_USB_DEVICE_CLASS=y
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_R8A66597_HCD=y
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_SM501=y
+##
+## file: drivers/usb/storage/Kconfig
+##
+CONFIG_USB_STORAGE=y
-#
-# Graphics support
-#
+##
+## file: drivers/video/Kconfig
+##
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-
-#
-# Frame buffer hardware drivers
-#
CONFIG_FB_SM501=y
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
+##
+## file: drivers/video/console/Kconfig
+##
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+
+##
+## file: drivers/video/logo/Kconfig
+##
CONFIG_LOGO=y
CONFIG_LOGO_SUPERH_MONO=y
CONFIG_LOGO_SUPERH_VGA16=y
CONFIG_LOGO_SUPERH_CLUT224=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-
-#
-# USB Host
-#
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICE_CLASS=y
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_R8A66597_HCD=y
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
+##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_WATCHDOG=y
+CONFIG_SH_WDT=y
+# CONFIG_USBPCWATCHDOG is not set
-#
-# RTC
-#
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+##
+## file: fs/ext3/Kconfig
+##
+CONFIG_EXT3_FS=y
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
+##
+## file: kernel/time/Kconfig
+##
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_RS5C372=y
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_SPARSEMEM_MANUAL=y
+## end choice
+CONFIG_MIGRATION=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_SH is not set
-# CONFIG_RTC_DRV_GENERIC is not set
-CONFIG_DMADEVICES=y
+##
+## file: unknown
+##
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_PMB_ENABLE=y
+CONFIG_PMB_FIXED=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
-#
-# File systems
-#
-CONFIG_EXT3_FS=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Tue Feb 8 18:47:14 2011 (r16864)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Tue Feb 8 19:08:41 2011 (r16865)
@@ -2,7 +2,6 @@
## file: arch/Kconfig
##
CONFIG_KPROBES=y
-CONFIG_KRETPROBES=y
##
## file: arch/sparc/Kconfig
@@ -118,7 +117,6 @@
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
##
## file: drivers/i2c/busses/Kconfig
@@ -138,7 +136,6 @@
# CONFIG_I2C_VIAPRO is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_STUB is not set
@@ -254,14 +251,9 @@
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
##
## file: drivers/media/video/bt8xx/Kconfig
@@ -418,6 +410,16 @@
CONFIG_SERIAL_JSM=m
##
+## file: drivers/staging/cpia/Kconfig
+##
+# CONFIG_VIDEO_CPIA is not set
+
+##
+## file: drivers/staging/stradis/Kconfig
+##
+# CONFIG_VIDEO_STRADIS is not set
+
+##
## file: drivers/telephony/Kconfig
##
# CONFIG_PHONE is not set
@@ -458,8 +460,8 @@
# CONFIG_FB_P9100 is not set
# CONFIG_FB_LEO is not set
CONFIG_FB_XVR500=y
-CONFIG_FB_XVR1000=y
CONFIG_FB_XVR2500=y
+CONFIG_FB_XVR1000=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
@@ -645,3 +647,12 @@
CONFIG_SND_SUN_CS4231=m
CONFIG_SND_SUN_DBRI=m
+##
+## file: unknown
+##
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+
More information about the Kernel-svn-changes
mailing list