[kernel] r18454 - in dists/trunk/linux-2.6/debian/config: . alpha armel armhf hppa ia64 kernelarch-x86 m68k mips mipsel powerpc s390 sh4 sparc
Bastian Blank
waldi at alioth.debian.org
Fri Jan 6 14:40:23 UTC 2012
Author: waldi
Date: Fri Jan 6 14:40:22 2012
New Revision: 18454
Log:
debian/config: Automatically reorder config.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/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/armhf/config.mx5
dists/trunk/linux-2.6/debian/config/armhf/config.omap
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/hppa/config.parisc64
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/m68k/config
dists/trunk/linux-2.6/debian/config/m68k/config.amiga
dists/trunk/linux-2.6/debian/config/m68k/config.atari
dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
dists/trunk/linux-2.6/debian/config/m68k/config.mac
dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
dists/trunk/linux-2.6/debian/config/mips/config
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
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.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 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -466,7 +466,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -551,95 +550,206 @@
##
## file: drivers/net/Kconfig
##
+CONFIG_NET_FC=y
+CONFIG_NETPOLL_TRAP=y
CONFIG_NET_SB1000=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
CONFIG_EL3=m
CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_EL2=m
+CONFIG_AC3200=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_E2100=m
+CONFIG_ES3210=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LNE390=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_PCMCIA_PCNET=m
CONFIG_ULTRA=m
CONFIG_ULTRA32=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI5010=m
-CONFIG_NI52=m
+CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
+CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_DEPCA=m
+CONFIG_PCMCIA_NMCLAN=m
CONFIG_NI65=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+CONFIG_B44=m
+
+##
+## file: drivers/net/ethernet/cirrus/Kconfig
+##
+CONFIG_CS89x0=m
+
+##
+## file: drivers/net/ethernet/dec/Kconfig
+##
+CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_PCMCIA_XIRCOM=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
CONFIG_AT1700=m
-CONFIG_DEPCA=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_ETH16I=m
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/i825xx/Kconfig
+##
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_APRICOT=m
CONFIG_EEXPRESS=m
CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
+CONFIG_NI52=m
CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_LNE390=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+CONFIG_FORCEDETH=m
+
+##
+## file: drivers/net/ethernet/racal/Kconfig
+##
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI5010=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/seeq/Kconfig
+##
+CONFIG_SEEQ8005=m
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_FDDI=y
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_NET_FC=y
-CONFIG_NETPOLL_TRAP=y
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/xircom/Kconfig
##
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_ISA=m
-CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_PCMCIA_XIRC2PS=m
+
+##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_FDDI=y
+CONFIG_SKFP=m
##
## file: drivers/net/hamradio/Kconfig
@@ -650,6 +760,13 @@
# CONFIG_SCC_TRXECHO is not set
##
+## file: drivers/net/hippi/Kconfig
+##
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+
+##
## file: drivers/net/irda/Kconfig
##
CONFIG_IRTTY_SIR=m
@@ -663,31 +780,9 @@
CONFIG_VIA_FIR=m
##
-## file: drivers/net/pcmcia/Kconfig
-##
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-
-##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/plip/Kconfig
##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
+CONFIG_PLIP=m
##
## file: drivers/net/wan/Kconfig
@@ -1156,3 +1251,12 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NET_ISA=y
+CONFIG_NET_PCI=y
+CONFIG_NET_PCMCIA=y
+CONFIG_NET_VENDOR_SMC=y
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Jan 6 14:40:22 2012 (r18454)
@@ -324,7 +324,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -390,7 +389,6 @@
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
-# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_PCI is not set
CONFIG_MTD_PLATRAM=m
@@ -407,21 +405,41 @@
# CONFIG_MTD_ONENAND is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
##
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_SMC91X is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+# CONFIG_NET_TULIP is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/smsc/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_SMC91X is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
##
## file: drivers/net/phy/Kconfig
@@ -439,11 +457,6 @@
# CONFIG_TR is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_NET_TULIP is not set
-
-##
## file: drivers/net/wireless/Kconfig
##
CONFIG_ATMEL=m
@@ -712,3 +725,10 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_NET_PCI is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Jan 6 14:40:22 2012 (r18454)
@@ -322,7 +322,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -385,7 +384,6 @@
##
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
CONFIG_MTD_IXP4XX=y
# CONFIG_MTD_PCI is not set
CONFIG_MTD_PLATRAM=m
@@ -405,38 +403,83 @@
##
## file: drivers/net/Kconfig
##
-# CONFIG_AX88796 is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_SMC91X is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+# CONFIG_AX88796 is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+# CONFIG_B44 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+# CONFIG_NET_TULIP is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/microchip/Kconfig
+##
CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_B44 is not set
-# CONFIG_NET_POCKET is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
# CONFIG_S2IO is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/smsc/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_SMC91X is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
##
-## file: drivers/net/arm/Kconfig
+## file: drivers/net/ethernet/xscale/Kconfig
##
CONFIG_IXP4XX_ETH=m
##
+## file: drivers/net/fddi/Kconfig
+##
+# CONFIG_FDDI is not set
+
+##
+## file: drivers/net/hippi/Kconfig
+##
+# CONFIG_HIPPI is not set
+
+##
## file: drivers/net/phy/Kconfig
##
CONFIG_PHYLIB=m
@@ -452,11 +495,6 @@
# CONFIG_TR is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_NET_TULIP is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
@@ -791,3 +829,13 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_POCKET is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Jan 6 14:40:22 2012 (r18454)
@@ -272,7 +272,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
@@ -337,7 +336,6 @@
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=0
-# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_IMPA7 is not set
# CONFIG_MTD_INTEL_VR_NOR is not set
# CONFIG_MTD_PLATRAM is not set
@@ -366,35 +364,76 @@
CONFIG_MTD_UBI=y
##
-## file: drivers/net/Kconfig
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/atheros/Kconfig
+##
+# CONFIG_ATL1 is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
##
-# CONFIG_NET_ETHERNET is not set
-CONFIG_NETDEV_1000=y
# CONFIG_DL2K is not set
+
+##
+## file: drivers/net/ethernet/icplus/Kconfig
+##
+# CONFIG_IP1000 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
# CONFIG_E1000 is not set
# CONFIG_E1000E is not set
-# CONFIG_IP1000 is not set
# CONFIG_IGB is not set
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+CONFIG_MV643XX_ETH=m
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
# CONFIG_NS83820 is not set
+
+##
+## file: drivers/net/ethernet/packetengines/Kconfig
+##
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
+
+##
+## file: drivers/net/ethernet/qlogic/Kconfig
+##
+# CONFIG_QLA3XXX is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
# CONFIG_R8169 is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_MV643XX_ETH=m
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_BNX2X is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/via/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_VIA_VELOCITY is not set
##
## file: drivers/net/phy/Kconfig
@@ -638,3 +677,12 @@
CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
CONFIG_SND_KIRKWOOD_SOC_T5325=m
+##
+## file: unknown
+##
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NET_ETHERNET is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Jan 6 14:40:22 2012 (r18454)
@@ -268,7 +268,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
@@ -335,7 +334,6 @@
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=0
-# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_IMPA7 is not set
# CONFIG_MTD_INTEL_VR_NOR is not set
# CONFIG_MTD_PLATRAM is not set
@@ -359,35 +357,76 @@
# CONFIG_MTD_ONENAND is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/atheros/Kconfig
+##
+# CONFIG_ATL1 is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
##
-# CONFIG_NET_ETHERNET is not set
-CONFIG_NETDEV_1000=y
# CONFIG_DL2K is not set
+
+##
+## file: drivers/net/ethernet/icplus/Kconfig
+##
+# CONFIG_IP1000 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
# CONFIG_E1000 is not set
# CONFIG_E1000E is not set
-# CONFIG_IP1000 is not set
# CONFIG_IGB is not set
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+CONFIG_MV643XX_ETH=m
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
# CONFIG_NS83820 is not set
+
+##
+## file: drivers/net/ethernet/packetengines/Kconfig
+##
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
+
+##
+## file: drivers/net/ethernet/qlogic/Kconfig
+##
+# CONFIG_QLA3XXX is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
# CONFIG_R8169 is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_MV643XX_ETH=m
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_BNX2X is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/via/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_VIA_VELOCITY is not set
##
## file: drivers/net/phy/Kconfig
@@ -585,3 +624,12 @@
##
CONFIG_WAN_ROUTER=m
+##
+## file: unknown
+##
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NET_ETHERNET is not set
+
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Fri Jan 6 14:40:22 2012 (r18454)
@@ -184,57 +184,145 @@
##
## file: drivers/net/Kconfig
##
+# CONFIG_NET_FC is not set
CONFIG_IFB=m
-CONFIG_NET_ETHERNET=y
-# CONFIG_AX88796 is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-CONFIG_SMC91X=m
-# CONFIG_DM9000 is not set
-CONFIG_HP100=m
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+# CONFIG_AX88796 is not set
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/alteon/Kconfig
+##
+# CONFIG_ACENIC is not set
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+CONFIG_HP100=m
+
+##
+## file: drivers/net/ethernet/icplus/Kconfig
+##
+# CONFIG_IP1000 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/silan/Kconfig
+##
+CONFIG_SC92031=m
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_SMC91X=m
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/ti/Kconfig
+##
# CONFIG_TLAN is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NETDEV_1000=y
-# CONFIG_ACENIC is not set
-# CONFIG_IP1000 is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/fddi/Kconfig
+##
# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HIPPI is not set
##
## file: drivers/net/phy/Kconfig
@@ -437,3 +525,11 @@
##
# CONFIG_WAN_ROUTER is not set
+##
+## file: unknown
+##
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.mx5 Fri Jan 6 14:40:22 2012 (r18454)
@@ -4,14 +4,14 @@
## choice: ARM system type
CONFIG_ARCH_MXC=y
## end choice
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
#. cpufreq driver for i.MX CPU
CONFIG_CPU_FREQ_IMX=m
#. Enable NEON SIMD support
CONFIG_NEON=y
-CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
##
## file: arch/arm/Kconfig.debug
@@ -32,8 +32,6 @@
##
## choice: Freescale CPU family:
CONFIG_ARCH_MX5=y
-CONFIG_ARCH_MX51=y
-CONFIG_ARCH_MX53=y
## end choice
#. Enable PWM driver
CONFIG_MXC_PWM=y
Modified: dists/trunk/linux-2.6/debian/config/armhf/config.omap
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.omap Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.omap Fri Jan 6 14:40:22 2012 (r18454)
@@ -35,7 +35,6 @@
CONFIG_OMAP_MCBSP=y
CONFIG_OMAP_MBOX_FWK=y
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-# CONFIG_OMAP_IOMMU_DEBUG is not set
# CONFIG_OMAP_MPU_TIMER is not set
CONFIG_OMAP_32K_TIMER=y
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
@@ -95,6 +94,11 @@
CONFIG_TOUCHSCREEN_TSC2005=m
##
+## file: drivers/iommu/Kconfig
+##
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+
+##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_CLASS=y
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,9 +1,4 @@
##
-## file: arch/Kconfig
-##
-# CONFIG_JUMP_LABEL is not set
-
-##
## file: block/Kconfig
##
CONFIG_BLOCK=y
@@ -394,7 +389,6 @@
CONFIG_LOGITECH_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_FF=y
CONFIG_HID_MAGICMOUSE=m
CONFIG_HID_MULTITOUCH=m
CONFIG_HID_NTRIG=m
@@ -433,6 +427,11 @@
CONFIG_USB_HIDDEV=y
##
+## file: drivers/hv/Kconfig
+##
+# CONFIG_HYPERV is not set
+
+##
## file: drivers/hwmon/Kconfig
##
CONFIG_HWMON=y
@@ -713,7 +712,6 @@
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_MMA8450 is not set
# CONFIG_INPUT_MPU3050 is not set
-CONFIG_INPUT_ATI_REMOTE=m
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
# CONFIG_INPUT_KXTJ9 is not set
@@ -857,7 +855,6 @@
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_NET48XX=m
-CONFIG_LEDS_ALIX2=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
@@ -1172,6 +1169,8 @@
CONFIG_VIDEO_ADV7170=m
CONFIG_VIDEO_ADV7175=m
CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
CONFIG_VIDEO_VIVI=m
@@ -1183,8 +1182,6 @@
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_IMX074=m
CONFIG_SOC_CAMERA_MT9M001=m
@@ -1244,6 +1241,11 @@
CONFIG_VIDEO_CX23885=m
##
+## file: drivers/media/video/cx25821/Kconfig
+##
+# CONFIG_VIDEO_CX25821 is not set
+
+##
## file: drivers/media/video/cx25840/Kconfig
##
CONFIG_VIDEO_CX25840=m
@@ -1451,7 +1453,6 @@
##
## file: drivers/mfd/Kconfig
##
-CONFIG_MFD_SUPPORT=y
CONFIG_MFD_SM501=m
CONFIG_HTC_PASIC3=m
# CONFIG_UCB1400_CORE is not set
@@ -1648,35 +1649,17 @@
## file: drivers/net/Kconfig
##
CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
+CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
CONFIG_MII=m
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_IFB=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
CONFIG_VMXNET3=m
@@ -1801,6 +1784,15 @@
CONFIG_ENIC=m
##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+# CONFIG_DE4X5 is not set
+CONFIG_ULI526X=m
+
+##
## file: drivers/net/ethernet/dlink/Kconfig
##
CONFIG_NET_VENDOR_DLINK=y
@@ -1992,6 +1984,12 @@
CONFIG_VIA_VELOCITY=m
##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+
+##
## file: drivers/net/hamradio/Kconfig
##
CONFIG_MKISS=m
@@ -2046,6 +2044,30 @@
# CONFIG_MDIO_GPIO is not set
##
+## file: drivers/net/ppp/Kconfig
+##
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+
+##
+## file: drivers/net/slip/Kconfig
+##
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+##
## file: drivers/net/tokenring/Kconfig
##
CONFIG_TR=y
@@ -2062,15 +2084,6 @@
CONFIG_SMCTR=m
##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-# CONFIG_DE4X5 is not set
-CONFIG_ULI526X=m
-
-##
## file: drivers/net/usb/Kconfig
##
CONFIG_USB_CATC=m
@@ -2200,6 +2213,13 @@
## end choice
##
+## file: drivers/net/wireless/brcm80211/Kconfig
+##
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
+
+##
## file: drivers/net/wireless/hostap/Kconfig
##
CONFIG_HOSTAP=m
@@ -2564,8 +2584,8 @@
CONFIG_SCSI_AHA1740=m
CONFIG_SCSI_AACRAID=m
CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_ADVANSYS=m
-# CONFIG_SCSI_ARCMSR_AER is not set
CONFIG_SCSI_HPTIOP=m
CONFIG_VMWARE_PVSCSI=m
CONFIG_LIBFC=m
@@ -2576,7 +2596,6 @@
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_SCSI_IZIP_SLOW_CTR is not set
CONFIG_SCSI_STEX=m
-CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_IPR is not set
CONFIG_SCSI_LPFC=m
@@ -2730,13 +2749,6 @@
# CONFIG_ASUS_OLED is not set
##
-## file: drivers/staging/brcm80211/Kconfig
-##
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-
-##
## file: drivers/staging/comedi/Kconfig
##
# CONFIG_COMEDI is not set
@@ -2747,11 +2759,6 @@
# CONFIG_CRYSTALHD is not set
##
-## file: drivers/staging/cx25821/Kconfig
-##
-# CONFIG_VIDEO_CX25821 is not set
-
-##
## file: drivers/staging/echo/Kconfig
##
# CONFIG_ECHO is not set
@@ -2767,16 +2774,6 @@
# CONFIG_TRANZPORT is not set
##
-## file: drivers/staging/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
-
-##
-## file: drivers/staging/hv/Kconfig
-##
-# CONFIG_HYPERV is not set
-
-##
## file: drivers/staging/iio/Kconfig
##
# CONFIG_IIO is not set
@@ -2787,6 +2784,11 @@
# CONFIG_LINE6_USB is not set
##
+## file: drivers/staging/media/go7007/Kconfig
+##
+# CONFIG_VIDEO_GO7007 is not set
+
+##
## file: drivers/staging/panel/Kconfig
##
# CONFIG_PANEL is not set
@@ -4812,3 +4814,13 @@
##
CONFIG_INITRAMFS_SOURCE=""
+##
+## file: unknown
+##
+CONFIG_INPUT_ATI_REMOTE=m
+# CONFIG_JUMP_LABEL is not set
+CONFIG_LEDS_ALIX2=m
+CONFIG_LOGIWII_FF=y
+CONFIG_MFD_SUPPORT=y
+# CONFIG_SCSI_ARCMSR_AER is not set
+
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -219,116 +219,216 @@
##
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-CONFIG_LASI_82596=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
+# CONFIG_NET_FC is not set
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
CONFIG_EL3=m
# CONFIG_3C515 is not set
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_LANCE is not set
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_EL2=m
+CONFIG_AC3200=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_E2100=m
+CONFIG_ES3210=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LNE390=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_PCMCIA_PCNET=m
CONFIG_ULTRA=m
CONFIG_ULTRA32=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-# CONFIG_NI52 is not set
+CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
+CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+# CONFIG_LANCE is not set
+CONFIG_DEPCA=m
+CONFIG_PCMCIA_NMCLAN=m
# CONFIG_NI65 is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+CONFIG_B44=m
+
+##
+## file: drivers/net/ethernet/cirrus/Kconfig
+##
+CONFIG_CS89x0=m
+
+##
+## file: drivers/net/ethernet/dec/Kconfig
+##
+CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+CONFIG_PCMCIA_XIRCOM=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
CONFIG_AT1700=m
-CONFIG_DEPCA=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_ETH16I=m
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/i825xx/Kconfig
+##
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_APRICOT=m
CONFIG_EEXPRESS=m
CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
+CONFIG_LASI_82596=m
CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
+# CONFIG_NI52 is not set
CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_LNE390=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
+# CONFIG_VXGE is not set
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+CONFIG_FORCEDETH=m
+
+##
+## file: drivers/net/ethernet/racal/Kconfig
+##
+CONFIG_NET_VENDOR_RACAL=y
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/seeq/Kconfig
+##
+CONFIG_SEEQ8005=m
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+# CONFIG_NIU is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_VXGE is not set
-# CONFIG_NIU is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-# CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/ethernet/xircom/Kconfig
##
-# CONFIG_ATALK is not set
+CONFIG_PCMCIA_XIRC2PS=m
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/fddi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_FDDI is not set
##
-## file: drivers/net/pcmcia/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
+# CONFIG_HIPPI is not set
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+CONFIG_PLIP=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-CONFIG_NET_TULIP=y
-# CONFIG_DE2104X is not set
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -733,3 +833,11 @@
##
# CONFIG_SND_HDA_INTEL is not set
+##
+## file: unknown
+##
+CONFIG_NET_ISA=y
+CONFIG_NET_PCI=y
+CONFIG_NET_PCMCIA=y
+CONFIG_NET_VENDOR_SMC=y
+
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc Fri Jan 6 14:40:22 2012 (r18454)
@@ -9,9 +9,13 @@
# CONFIG_HPUX is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/racal/Kconfig
##
# CONFIG_NI5010 is not set
+
+##
+## file: drivers/net/ethernet/ti/Kconfig
+##
CONFIG_TLAN=m
##
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp Fri Jan 6 14:40:22 2012 (r18454)
@@ -10,7 +10,7 @@
CONFIG_NR_CPUS=8
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/ti/Kconfig
##
CONFIG_TLAN=m
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc64 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc64 Fri Jan 6 14:40:22 2012 (r18454)
@@ -9,7 +9,7 @@
# CONFIG_SMP is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/racal/Kconfig
##
# CONFIG_NI5010 is not set
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -379,37 +379,8 @@
##
## file: drivers/net/Kconfig
##
-CONFIG_NET_SB1000=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_FDDI=y
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
CONFIG_NET_FC=y
+CONFIG_NET_SB1000=m
##
## file: drivers/net/arcnet/Kconfig
@@ -424,31 +395,47 @@
CONFIG_ARCNET_RIM_I=m
CONFIG_ARCNET_COM20020=m
CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
##
-## file: drivers/net/irda/Kconfig
+## file: drivers/net/ethernet/Kconfig
##
-CONFIG_IRTTY_SIR=m
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_VLSI_FIR=m
+CONFIG_FEALNX=m
##
-## file: drivers/net/pcmcia/Kconfig
+## file: drivers/net/ethernet/3com/Kconfig
##
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
+CONFIG_NET_VENDOR_3COM=y
CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
CONFIG_PCMCIA_PCNET=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
+CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+CONFIG_B44=m
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
##
CONFIG_NET_TULIP=y
CONFIG_DE2104X=m
@@ -460,6 +447,93 @@
CONFIG_PCMCIA_XIRCOM=m
##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
+CONFIG_PCMCIA_FMVJ18X=m
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
+CONFIG_E100=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_NATSEMI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+CONFIG_FORCEDETH=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
+CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/xircom/Kconfig
+##
+CONFIG_PCMCIA_XIRC2PS=m
+
+##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_FDDI=y
+CONFIG_SKFP=m
+
+##
+## file: drivers/net/hippi/Kconfig
+##
+# CONFIG_HIPPI is not set
+
+##
+## file: drivers/net/irda/Kconfig
+##
+CONFIG_IRTTY_SIR=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_VLSI_FIR=m
+
+##
+## file: drivers/net/plip/Kconfig
+##
+CONFIG_PLIP=m
+
+##
## file: drivers/net/wan/Kconfig
##
CONFIG_WAN=y
@@ -806,3 +880,9 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+CONFIG_NET_PCI=y
+CONFIG_NET_PCMCIA=y
+
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -98,7 +98,6 @@
##
CONFIG_XEN=y
# CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEBUG is not set
##
## file: crypto/Kconfig
@@ -509,9 +508,9 @@
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_SCMI=m
+CONFIG_I2C_EG20T=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_EG20T=m
CONFIG_I2C_PCA_ISA=m
CONFIG_SCx200_ACB=m
@@ -622,13 +621,6 @@
CONFIG_INPUT_TOUCHSCREEN=y
##
-## file: drivers/iommu/Kconfig
-##
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_INTR_REMAP=y
-
-##
## file: drivers/isdn/Kconfig
##
CONFIG_ISDN=y
@@ -694,6 +686,13 @@
CONFIG_VIDEO_VIA_CAMERA=m
##
+## file: drivers/media/video/tm6000/Kconfig
+##
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
@@ -726,7 +725,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -818,18 +816,11 @@
## file: drivers/net/Kconfig
##
CONFIG_DUMMY=m
+CONFIG_NET_FC=y
+# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_SB1000=m
-CONFIG_PCH_GBE=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_FDDI=y
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
##
## file: drivers/net/arcnet/Kconfig
@@ -893,6 +884,18 @@
CONFIG_B44=m
##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_PCMCIA_XIRCOM=m
+
+##
## file: drivers/net/ethernet/dlink/Kconfig
##
CONFIG_NET_VENDOR_DLINK=y
@@ -932,6 +935,11 @@
CONFIG_FORCEDETH=m
##
+## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+##
+CONFIG_PCH_GBE=m
+
+##
## file: drivers/net/ethernet/realtek/Kconfig
##
CONFIG_NET_VENDOR_REALTEK=y
@@ -976,6 +984,19 @@
CONFIG_PCMCIA_XIRC2PS=m
##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_FDDI=y
+CONFIG_SKFP=m
+
+##
+## file: drivers/net/hippi/Kconfig
+##
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+
+##
## file: drivers/net/irda/Kconfig
##
CONFIG_IRTTY_SIR=m
@@ -989,21 +1010,9 @@
CONFIG_VIA_FIR=m
##
-## file: drivers/net/spi/Kconfig
-##
-CONFIG_SPI_TOPCLIFF_PCH=m
-
-##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/plip/Kconfig
##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
+CONFIG_PLIP=m
##
## file: drivers/net/wan/Kconfig
@@ -1190,6 +1199,11 @@
CONFIG_SFI=y
##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI_TOPCLIFF_PCH=m
+
+##
## file: drivers/staging/comedi/Kconfig
##
CONFIG_COMEDI=m
@@ -1277,15 +1291,9 @@
CONFIG_COMEDI_FC=m
##
-## file: drivers/staging/easycap/Kconfig
-##
-CONFIG_EASYCAP=m
-
-##
## file: drivers/staging/et131x/Kconfig
##
CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
##
## file: drivers/staging/gma500/Kconfig
@@ -1300,7 +1308,12 @@
CONFIG_HYPERV_MOUSE=m
##
-## file: drivers/staging/lirc/Kconfig
+## file: drivers/staging/media/easycap/Kconfig
+##
+CONFIG_EASYCAP=m
+
+##
+## file: drivers/staging/media/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -1318,7 +1331,6 @@
##
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
##
## file: drivers/staging/rtl8187se/Kconfig
@@ -1346,13 +1358,6 @@
CONFIG_RTS_PSTOR=m
##
-## file: drivers/staging/tm6000/Kconfig
-##
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-##
## file: drivers/staging/usbip/Kconfig
##
CONFIG_USBIP_CORE=m
@@ -1437,7 +1442,9 @@
## file: drivers/usb/gadget/Kconfig
##
CONFIG_USB_GADGET=m
+## choice: USB Peripheral Controller
CONFIG_USB_EG20T=m
+## end choice
##
## file: drivers/usb/host/Kconfig
@@ -1567,7 +1574,6 @@
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_GNTDEV=m
CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=y
##
## file: fs/partitions/Kconfig
@@ -1757,3 +1763,15 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_INTR_REMAP=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+# CONFIG_XEN_DEBUG is not set
+CONFIG_XEN_PLATFORM_PCI=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 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Fri Jan 6 14:40:22 2012 (r18454)
@@ -260,6 +260,7 @@
CONFIG_HPLAN_PLUS=m
CONFIG_HPLAN=m
CONFIG_NE2000=m
+CONFIG_ULTRA=m
CONFIG_WD80x3=m
##
@@ -267,7 +268,6 @@
##
CONFIG_NET_VENDOR_AMD=y
CONFIG_LANCE=m
-CONFIG_ULTRA=m
CONFIG_DEPCA=m
CONFIG_NI65=m
Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,7 +1,11 @@
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.cpu
##
# CONFIG_ADVANCED is not set
+
+##
+## file: arch/m68k/Kconfig.devices
+##
CONFIG_PROC_HARDWARE=y
##
@@ -98,8 +102,8 @@
CONFIG_NETDEVICES=y
# CONFIG_BONDING is not set
CONFIG_EQUALIZER=m
-# CONFIG_TUN is not set
# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_TUN is not set
##
## file: drivers/net/wan/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,12 +1,30 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.bus
##
+CONFIG_ZORRO=y
+CONFIG_AMIGA_PCMCIA=y
+
+##
+## file: arch/m68k/Kconfig.cpu
+##
+CONFIG_M68020=y
+CONFIG_M68030=y
+CONFIG_M68040=y
+CONFIG_M68060=y
+CONFIG_M68KFPU_EMU=y
+CONFIG_M68KFPU_EMU_EXTRAPREC=y
+# CONFIG_M68KFPU_EMU_ONLY is not set
+
+##
+## file: arch/m68k/Kconfig.devices
+##
+# CONFIG_HEARTBEAT is not set
CONFIG_AMIGA_BUILTIN_SERIAL=y
CONFIG_MULTIFACE_III_TTY=m
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
CONFIG_AMIGA=y
# CONFIG_ATARI is not set
@@ -17,16 +35,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-CONFIG_M68060=y
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-CONFIG_ZORRO=y
-CONFIG_AMIGA_PCMCIA=y
-# CONFIG_HEARTBEAT is not set
##
## file: drivers/block/Kconfig
@@ -123,28 +131,48 @@
# CONFIG_SERIO_PARKBD is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
+# CONFIG_NET_VENDOR_3COM is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
##
-CONFIG_NET_ETHERNET=y
-CONFIG_ARIADNE=m
-CONFIG_A2065=m
CONFIG_HYDRA=m
-CONFIG_ZORRO8390=m
CONFIG_APNE=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
+CONFIG_ZORRO8390=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_A2065=m
+CONFIG_ARIADNE=m
# CONFIG_DEPCA is not set
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
+# CONFIG_AT1700 is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
-CONFIG_PLIP=m
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/racal/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+##
+## file: drivers/net/plip/Kconfig
+##
+CONFIG_PLIP=m
##
## file: drivers/net/tokenring/Kconfig
@@ -290,6 +318,10 @@
# CONFIG_FB_CYBER is not set
# CONFIG_FB_RETINAZ3 is not set
# CONFIG_FB_VIRGE is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_OKTAGON_SCSI is not set
CONFIG_SCSI_AMIGA7XX=y
# CONFIG_SCSI_NCR53C7xx_FAST is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,13 +1,29 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.cpu
##
+CONFIG_M68020=y
+CONFIG_M68030=y
+CONFIG_M68040=y
+CONFIG_M68060=y
+CONFIG_M68KFPU_EMU=y
+CONFIG_M68KFPU_EMU_EXTRAPREC=y
+# CONFIG_M68KFPU_EMU_ONLY is not set
+
+##
+## file: arch/m68k/Kconfig.devices
+##
+CONFIG_HEARTBEAT=y
+CONFIG_NATFEAT=y
+CONFIG_NFBLOCK=y
+CONFIG_NFCON=y
+CONFIG_NFETH=y
CONFIG_ATARI_MFPSER=m
CONFIG_ATARI_MIDI=m
CONFIG_ATARI_DSP56K=m
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
# CONFIG_AMIGA is not set
CONFIG_ATARI=y
@@ -18,18 +34,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-CONFIG_NATFEAT=y
-CONFIG_NFBLOCK=y
-CONFIG_NFCON=y
-CONFIG_NFETH=y
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-CONFIG_M68060=y
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-CONFIG_HEARTBEAT=y
##
## file: drivers/block/Kconfig
@@ -95,11 +99,18 @@
CONFIG_SERIO_LIBPS2=y
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/amd/Kconfig
##
-CONFIG_NET_ETHERNET=y
CONFIG_ATARILANCE=y
+
+##
+## file: drivers/net/plip/Kconfig
+##
# CONFIG_PLIP is not set
+
+##
+## file: drivers/net/ppp/Kconfig
+##
CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
@@ -221,5 +232,6 @@
CONFIG_ATARI_ROM_ISA=y
CONFIG_ATARI_SCC=y
CONFIG_ATARI_SCC_DMA=y
+CONFIG_NET_ETHERNET=y
CONFIG_STRAM_PROC=y
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000 Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,11 +1,19 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.cpu
+##
+# CONFIG_M68020 is not set
+# CONFIG_M68030 is not set
+CONFIG_M68040=y
+CONFIG_M68060=y
+# CONFIG_M68KFPU_EMU is not set
+
+##
+## file: arch/m68k/Kconfig.devices
##
-CONFIG_BVME6000_SCC=y
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
@@ -19,11 +27,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-# CONFIG_M68020 is not set
-# CONFIG_M68030 is not set
-CONFIG_M68040=y
-CONFIG_M68060=y
-# CONFIG_M68KFPU_EMU is not set
##
## file: drivers/char/Kconfig
@@ -70,9 +73,8 @@
CONFIG_SERIO_LIBPS2=m
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/i825xx/Kconfig
##
-CONFIG_NET_ETHERNET=y
CONFIG_BVME6000_NET=y
##
@@ -127,3 +129,9 @@
##
# CONFIG_SOUND is not set
+##
+## file: unknown
+##
+CONFIG_BVME6000_SCC=y
+CONFIG_NET_ETHERNET=y
+
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,10 +1,22 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.cpu
##
+CONFIG_M68020=y
+CONFIG_M68030=y
+CONFIG_M68040=y
+# CONFIG_M68060 is not set
+CONFIG_M68KFPU_EMU=y
+CONFIG_M68KFPU_EMU_EXTRAPREC=y
+# CONFIG_M68KFPU_EMU_ONLY is not set
+
+##
+## file: arch/m68k/Kconfig.devices
+##
+# CONFIG_HEARTBEAT is not set
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
@@ -15,14 +27,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-# CONFIG_M68060 is not set
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-# CONFIG_HEARTBEAT is not set
##
## file: drivers/block/Kconfig
@@ -90,21 +94,31 @@
# CONFIG_WINDFARM is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/appletalk/Kconfig
+##
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
##
-CONFIG_NET_ETHERNET=y
CONFIG_MAC8390=y
-CONFIG_MAC89x0=y
-CONFIG_MACSONIC=y # switched back on as requested by Finn Thain
+
+##
+## file: drivers/net/ethernet/apple/Kconfig
+##
CONFIG_MACMACE=y
-# CONFIG_NET_VENDOR_SMC is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/ethernet/cirrus/Kconfig
##
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
+CONFIG_MAC89x0=y
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_MACSONIC=y # switched back on as requested by Finn Thain
##
## file: drivers/parport/Kconfig
@@ -207,4 +221,6 @@
## file: unknown
##
CONFIG_MAC_SCC=y
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_VENDOR_SMC is not set
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme147 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme147 Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,11 +1,19 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.cpu
+##
+# CONFIG_M68020 is not set
+CONFIG_M68030=y
+# CONFIG_M68040 is not set
+# CONFIG_M68060 is not set
+# CONFIG_M68KFPU_EMU is not set
+
+##
+## file: arch/m68k/Kconfig.devices
##
-CONFIG_MVME147_SCC=y
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
@@ -19,11 +27,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-# CONFIG_M68020 is not set
-CONFIG_M68030=y
-# CONFIG_M68040 is not set
-# CONFIG_M68060 is not set
-# CONFIG_M68KFPU_EMU is not set
##
## file: drivers/char/Kconfig
@@ -65,9 +68,8 @@
CONFIG_SERIO_LIBPS2=m
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/amd/Kconfig
##
-CONFIG_NET_ETHERNET=y
CONFIG_MVME147_NET=y
##
@@ -135,3 +137,9 @@
##
# CONFIG_SOUND is not set
+##
+## file: unknown
+##
+CONFIG_MVME147_SCC=y
+CONFIG_NET_ETHERNET=y
+
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x Fri Jan 6 14:40:22 2012 (r18454)
@@ -1,11 +1,19 @@
##
-## file: arch/m68k/Kconfig
+## file: arch/m68k/Kconfig.cpu
+##
+# CONFIG_M68020 is not set
+# CONFIG_M68030 is not set
+CONFIG_M68040=y
+CONFIG_M68060=y
+# CONFIG_M68KFPU_EMU is not set
+
+##
+## file: arch/m68k/Kconfig.devices
##
-CONFIG_MVME162_SCC=y
CONFIG_SERIAL_CONSOLE=y
##
-## file: arch/m68k/Kconfig.mmu
+## file: arch/m68k/Kconfig.machine
##
# CONFIG_AMIGA is not set
# CONFIG_ATARI is not set
@@ -19,11 +27,6 @@
# CONFIG_SUN3X is not set
# CONFIG_Q40 is not set
# CONFIG_SUN3 is not set
-# CONFIG_M68020 is not set
-# CONFIG_M68030 is not set
-CONFIG_M68040=y
-CONFIG_M68060=y
-# CONFIG_M68KFPU_EMU is not set
##
## file: drivers/char/Kconfig
@@ -70,9 +73,8 @@
CONFIG_SERIO_LIBPS2=m
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/i825xx/Kconfig
##
-CONFIG_NET_ETHERNET=y
CONFIG_MVME16x_NET=y
##
@@ -140,3 +142,9 @@
##
# CONFIG_SOUND is not set
+##
+## file: unknown
+##
+CONFIG_MVME162_SCC=y
+CONFIG_NET_ETHERNET=y
+
Modified: dists/trunk/linux-2.6/debian/config/mips/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -9,7 +9,7 @@
# CONFIG_RAPIDIO is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/sun/Kconfig
##
# CONFIG_NIU is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Jan 6 14:40:22 2012 (r18454)
@@ -476,7 +476,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -579,64 +578,157 @@
##
## file: drivers/net/Kconfig
##
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+CONFIG_NET_FC=y
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_DM9000 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
-# CONFIG_TC35815 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_WINBOND_840 is not set
+CONFIG_DM9102=m
+# CONFIG_ULI526X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/silan/Kconfig
+##
+CONFIG_SC92031=m
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/toshiba/Kconfig
+##
+# CONFIG_TC35815 is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_NETDEV_1000=y
+
+##
+## file: drivers/net/fddi/Kconfig
+##
CONFIG_FDDI=y
CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
##
## file: drivers/net/irda/Kconfig
@@ -661,22 +753,14 @@
CONFIG_BROADCOM_PHY=m
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+CONFIG_PLIP=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_WINBOND_840 is not set
-CONFIG_DM9102=m
-# CONFIG_ULI526X is not set
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -1187,6 +1271,10 @@
## file: unknown
##
# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NET_PCI=y
+CONFIG_NET_POCKET=y
# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
CONFIG_VIRTUALIZATION=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Jan 6 14:40:22 2012 (r18454)
@@ -480,7 +480,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -583,64 +582,157 @@
##
## file: drivers/net/Kconfig
##
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+CONFIG_NET_FC=y
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_DM9000 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
-# CONFIG_TC35815 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_WINBOND_840 is not set
+CONFIG_DM9102=m
+# CONFIG_ULI526X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/silan/Kconfig
+##
+CONFIG_SC92031=m
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/toshiba/Kconfig
+##
+# CONFIG_TC35815 is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_NETDEV_1000=y
+
+##
+## file: drivers/net/fddi/Kconfig
+##
CONFIG_FDDI=y
CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
##
## file: drivers/net/irda/Kconfig
@@ -665,22 +757,14 @@
CONFIG_BROADCOM_PHY=m
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+CONFIG_PLIP=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_WINBOND_840 is not set
-CONFIG_DM9102=m
-# CONFIG_ULI526X is not set
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -1191,6 +1275,10 @@
## file: unknown
##
# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NET_PCI=y
+CONFIG_NET_POCKET=y
# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
CONFIG_VIRTUALIZATION=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon Fri Jan 6 14:40:22 2012 (r18454)
@@ -88,7 +88,7 @@
CONFIG_MTD_PHYSMAP=y
##
-## file: drivers/net/octeon/Kconfig
+## file: drivers/net/ethernet/octeon/Kconfig
##
CONFIG_OCTEON_MGMT_ETHERNET=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Fri Jan 6 14:40:22 2012 (r18454)
@@ -293,44 +293,85 @@
# CONFIG_MTD is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
##
# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_E2100=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_NE2000=m
CONFIG_ULTRA=m
CONFIG_ULTRA32=m
-CONFIG_SMC9194=m
-CONFIG_SMC91X=m
+CONFIG_WD80x3=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+# CONFIG_DEPCA is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
# CONFIG_DM9000 is not set
-# CONFIG_NET_VENDOR_RACAL is not set
+
+##
+## file: drivers/net/ethernet/dec/Kconfig
+##
+CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+# CONFIG_NET_TULIP is not set
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
+CONFIG_ETH16I=m
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
# CONFIG_HP100 is not set
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
+
+##
+## file: drivers/net/ethernet/i825xx/Kconfig
+##
CONFIG_EEXPRESS=m
CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_SEEQ8005=m
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
-CONFIG_SGISEEQ=y
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/ethernet/racal/Kconfig
##
-# CONFIG_ATALK is not set
+# CONFIG_NET_VENDOR_RACAL is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/seeq/Kconfig
##
-# CONFIG_ARCNET is not set
+CONFIG_SEEQ8005=m
+CONFIG_SGISEEQ=y
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_SMC9194=m
+CONFIG_SMC91X=m
##
## file: drivers/net/phy/Kconfig
@@ -343,11 +384,6 @@
# CONFIG_TR is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_NET_TULIP is not set
-
-##
## file: drivers/pcmcia/Kconfig
##
# CONFIG_PCCARD is not set
@@ -548,6 +584,10 @@
##
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+CONFIG_NET_ISA=y
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_POCKET is not set
+CONFIG_NET_VENDOR_SMC=y
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A 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 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Jan 6 14:40:22 2012 (r18454)
@@ -338,35 +338,92 @@
# CONFIG_MTD is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
##
-CONFIG_SGI_O2MACE_ETH=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/chelsio/Kconfig
+##
+# CONFIG_CHELSIO_T1 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
# CONFIG_DM9000 is not set
-CONFIG_NET_PCI=y
-CONFIG_E100=m
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
# CONFIG_DL2K is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
+CONFIG_E100=m
# CONFIG_E1000 is not set
+# CONFIG_IXGB is not set
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
# CONFIG_NS83820 is not set
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
+# CONFIG_S2IO is not set
+
+##
+## file: drivers/net/ethernet/packetengines/Kconfig
+##
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
+
+##
+## file: drivers/net/ethernet/sgi/Kconfig
+##
+CONFIG_SGI_O2MACE_ETH=y
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_BNX2X is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/ethernet/sun/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
##
## file: drivers/net/phy/Kconfig
@@ -379,16 +436,6 @@
# CONFIG_TR is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-
-##
## file: drivers/parport/Kconfig
##
CONFIG_PARPORT_IP32=m
@@ -674,6 +721,7 @@
CONFIG_INPUT_SGIO2_BTNS=m
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+CONFIG_NET_PCI=y
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_SAA5246A 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 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Jan 6 14:40:22 2012 (r18454)
@@ -423,53 +423,138 @@
##
## file: drivers/net/Kconfig
##
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+# CONFIG_NET_FC is not set
+
+##
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-CONFIG_FORCEDETH=m
+CONFIG_SB1250_MAC=y
+
+##
+## file: drivers/net/ethernet/chelsio/Kconfig
+##
+# CONFIG_CHELSIO_T1 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+# CONFIG_NET_TULIP is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+# CONFIG_IXGB is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
+# CONFIG_S2IO is not set
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+CONFIG_FORCEDETH=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_NET_POCKET is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_NET_FC is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/fddi/Kconfig
##
-# CONFIG_ATALK is not set
+# CONFIG_FDDI is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HIPPI is not set
##
## file: drivers/net/phy/Kconfig
@@ -478,14 +563,14 @@
# CONFIG_FIXED_PHY is not set
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+# CONFIG_PLIP is not set
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-# CONFIG_NET_TULIP is not set
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -763,6 +848,9 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NET_PCI=y
+# CONFIG_NET_POCKET is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Jan 6 14:40:22 2012 (r18454)
@@ -429,53 +429,138 @@
##
## file: drivers/net/Kconfig
##
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+# CONFIG_NET_FC is not set
+
+##
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-CONFIG_FORCEDETH=m
+CONFIG_SB1250_MAC=y
+
+##
+## file: drivers/net/ethernet/chelsio/Kconfig
+##
+# CONFIG_CHELSIO_T1 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+# CONFIG_NET_TULIP is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+# CONFIG_IXGB is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
+# CONFIG_S2IO is not set
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+CONFIG_FORCEDETH=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_NET_POCKET is not set
-CONFIG_NETDEV_1000=y
-CONFIG_SB1250_MAC=y
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_NET_FC is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/fddi/Kconfig
##
-# CONFIG_ATALK is not set
+# CONFIG_FDDI is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HIPPI is not set
##
## file: drivers/net/phy/Kconfig
@@ -484,14 +569,14 @@
# CONFIG_FIXED_PHY is not set
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+# CONFIG_PLIP is not set
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-# CONFIG_NET_TULIP is not set
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -769,6 +854,9 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NET_PCI=y
+# CONFIG_NET_POCKET is not set
CONFIG_SIBYTE_CFE=y
# CONFIG_SIMULATION is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -8,7 +8,7 @@
CONFIG_SECCOMP=y
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/sun/Kconfig
##
# CONFIG_NIU 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 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Fri Jan 6 14:40:22 2012 (r18454)
@@ -44,11 +44,18 @@
## end choice
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/amd/Kconfig
##
-CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
+
+##
+## file: drivers/net/ethernet/micrel/Kconfig
+##
# CONFIG_KSZ884X_PCI is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139TOO=m
CONFIG_8139TOO_TUNE_TWISTER=y
@@ -129,3 +136,8 @@
##
CONFIG_EXT3_FS=y
+##
+## file: unknown
+##
+CONFIG_NET_PCI=y
+
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Jan 6 14:40:22 2012 (r18454)
@@ -326,7 +326,6 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
CONFIG_MTD_CHAR=y
@@ -406,66 +405,172 @@
##
#. TODO
# CONFIG_EQUALIZER is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_AMD8111_ETH=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/chelsio/Kconfig
+##
+# CONFIG_CHELSIO_T1 is not set
+
+##
+## file: drivers/net/ethernet/davicom/Kconfig
+##
+# CONFIG_DM9000 is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=y
+CONFIG_TULIP=y
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_ULI526X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+# CONFIG_DL2K is not set
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+# CONFIG_E1000 is not set
+# CONFIG_IXGB is not set
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+# CONFIG_NS83820 is not set
+
+##
+## file: drivers/net/ethernet/neterion/Kconfig
+##
+# CONFIG_S2IO is not set
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/packetengines/Kconfig
+##
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R8169 is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+# CONFIG_SIS190 is not set
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+
+##
+## file: drivers/net/ethernet/ti/Kconfig
+##
# CONFIG_TLAN is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_NET_POCKET is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_BNX2X is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-# CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/fddi/Kconfig
##
-# CONFIG_ATALK is not set
+# CONFIG_FDDI is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HIPPI is not set
##
## file: drivers/net/phy/Kconfig
@@ -473,22 +578,14 @@
# CONFIG_PHYLIB is not set
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+CONFIG_PLIP=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=y
-CONFIG_TULIP=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-# CONFIG_ULI526X is not set
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -755,4 +852,7 @@
# CONFIG_LAN_SAA9730 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_SEAD is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_POCKET is not set
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -74,7 +74,6 @@
## file: arch/powerpc/platforms/prep/Kconfig
##
CONFIG_PREP_RESIDUAL=y
-CONFIG_PROC_PREPRESIDUAL=y
##
## file: drivers/ata/Kconfig
@@ -470,58 +469,170 @@
##
## file: drivers/net/Kconfig
##
-CONFIG_MACE=m
-# CONFIG_MACE_AAUI_PORT is not set
-CONFIG_BMAC=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
+CONFIG_NET_FC=y
+CONFIG_NETPOLL_TRAP=y
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+# CONFIG_ARCNET_COM90xx is not set
+CONFIG_ARCNET_COM90xxIO=m
+# CONFIG_ARCNET_RIM_I is not set
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-# CONFIG_AMD8111_ETH is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCMCIA_NMCLAN=m
+
+##
+## file: drivers/net/ethernet/apple/Kconfig
+##
+CONFIG_MACE=m
+# CONFIG_MACE_AAUI_PORT is not set
+CONFIG_BMAC=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_PCMCIA_XIRCOM=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+
+##
+## file: drivers/net/ethernet/fujitsu/Kconfig
+##
+CONFIG_PCMCIA_FMVJ18X=m
+
+##
+## file: drivers/net/ethernet/hp/Kconfig
+##
+# CONFIG_HP100 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+CONFIG_MV643XX_ETH=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=m
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+
+##
+## file: drivers/net/ethernet/ti/Kconfig
+##
CONFIG_TLAN=m
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
-CONFIG_MV643XX_ETH=m
+
+##
+## file: drivers/net/ethernet/xircom/Kconfig
+##
+CONFIG_PCMCIA_XIRC2PS=m
+
+##
+## file: drivers/net/fddi/Kconfig
+##
CONFIG_FDDI=y
CONFIG_SKFP=m
-CONFIG_HIPPI=y
-# CONFIG_ROADRUNNER is not set
-CONFIG_NET_FC=y
-CONFIG_NETPOLL_TRAP=y
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-# CONFIG_ARCNET_COM90xx is not set
-CONFIG_ARCNET_COM90xxIO=m
-# CONFIG_ARCNET_RIM_I is not set
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_HIPPI=y
+# CONFIG_ROADRUNNER is not set
##
## file: drivers/net/irda/Kconfig
@@ -539,32 +650,6 @@
CONFIG_VIA_FIR=m
##
-## file: drivers/net/pcmcia/Kconfig
-##
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-
-##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-
-##
## file: drivers/net/wan/Kconfig
##
CONFIG_WAN=y
@@ -990,3 +1075,10 @@
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
+##
+## file: unknown
+##
+CONFIG_NET_PCI=y
+CONFIG_NET_PCMCIA=y
+CONFIG_PROC_PREPRESIDUAL=y
+
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Jan 6 14:40:22 2012 (r18454)
@@ -68,6 +68,10 @@
## file: drivers/net/Kconfig
##
CONFIG_MII=y
+
+##
+## file: drivers/net/ethernet/freescale/Kconfig
+##
CONFIG_FEC_MPC52xx=m
CONFIG_FEC_MPC52xx_MDIO=y
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Fri Jan 6 14:40:22 2012 (r18454)
@@ -112,26 +112,27 @@
CONFIG_WINDFARM_PM112=m
##
-## file: drivers/net/Kconfig
+## file: drivers/net/ethernet/ibm/Kconfig
##
CONFIG_IBMVETH=m
-CONFIG_SPIDER_NET=m
-CONFIG_GELIC_NET=m
-CONFIG_GELIC_WIRELESS=y
-# CONFIG_MV643XX_ETH is not set
CONFIG_EHEA=m
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+# CONFIG_MV643XX_ETH is not set
+
+##
+## file: drivers/net/ethernet/pasemi/Kconfig
+##
CONFIG_PASEMI_MAC=m
##
-## file: drivers/net/ibm_newemac/Kconfig
+## file: drivers/net/ethernet/toshiba/Kconfig
##
-CONFIG_IBM_NEW_EMAC=m
-CONFIG_IBM_NEW_EMAC_RXB=128
-CONFIG_IBM_NEW_EMAC_TXB=64
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+CONFIG_GELIC_NET=m
+CONFIG_GELIC_WIRELESS=y
+CONFIG_SPIDER_NET=m
##
## file: drivers/pci/hotplug/Kconfig
@@ -199,3 +200,14 @@
CONFIG_SND_PS3=m
CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
+##
+## file: unknown
+##
+CONFIG_IBM_NEW_EMAC=m
+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_NEW_EMAC_RXB=128
+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_NEW_EMAC_TXB=64
+
Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/s390/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -55,15 +55,19 @@
# CONFIG_MEMSTICK is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
+## file: drivers/net/ppp/Kconfig
##
# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
##
-## file: drivers/net/appletalk/Kconfig
+## file: drivers/net/slip/Kconfig
##
-# CONFIG_ATALK is not set
+# CONFIG_SLIP is not set
##
## file: drivers/net/wan/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r Fri Jan 6 14:40:22 2012 (r18454)
@@ -103,8 +103,10 @@
##
CONFIG_NETDEVICES=y
CONFIG_MII=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_8139CP=y
##
@@ -208,5 +210,7 @@
##
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
CONFIG_SH_PCIDMA_NONCOHERENT=y
Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr Fri Jan 6 14:40:22 2012 (r18454)
@@ -147,7 +147,10 @@
##
CONFIG_NETDEVICES=y
CONFIG_MII=y
-CONFIG_NETDEV_1000=y
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
CONFIG_R8169=y
##
@@ -261,6 +264,7 @@
##
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_NETDEV_1000=y
CONFIG_PMB_ENABLE=y
CONFIG_PMB_FIXED=y
CONFIG_SH_PCIDMA_NONCOHERENT=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Fri Jan 6 14:30:38 2012 (r18453)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Fri Jan 6 14:40:22 2012 (r18454)
@@ -273,63 +273,134 @@
##
## file: drivers/net/Kconfig
##
-CONFIG_SUNLANCE=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNBMAC=m
-CONFIG_SUNQE=m
-CONFIG_SUNGEM=m
-CONFIG_SUNVNET=m
+CONFIG_NET_FC=y
+# CONFIG_NETPOLL_TRAP is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-CONFIG_NET_PCI=y
-# CONFIG_AMD8111_ETH is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
CONFIG_ADAPTEC_STARFIRE=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+# CONFIG_AMD8111_ETH is not set
+CONFIG_SUNLANCE=m
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
CONFIG_E100=m
-CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/nvidia/Kconfig
+##
+# CONFIG_FORCEDETH is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
# CONFIG_8139CP is not set
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
CONFIG_SIS900=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
+
+##
+## file: drivers/net/ethernet/sun/Kconfig
+##
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNBMAC=m
+CONFIG_SUNQE=m
+CONFIG_SUNGEM=m
+CONFIG_SUNVNET=m
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+
+##
+## file: drivers/net/fddi/Kconfig
+##
CONFIG_FDDI=y
CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/arcnet/Kconfig
+## file: drivers/net/hippi/Kconfig
##
-# CONFIG_ARCNET is not set
+# CONFIG_HIPPI is not set
##
-## file: drivers/net/tokenring/Kconfig
+## file: drivers/net/plip/Kconfig
##
-# CONFIG_TR is not set
+CONFIG_PLIP=m
##
-## file: drivers/net/tulip/Kconfig
+## file: drivers/net/tokenring/Kconfig
##
-CONFIG_NET_TULIP=y
-# CONFIG_DE2104X is not set
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
+# CONFIG_TR is not set
##
## file: drivers/net/wan/Kconfig
@@ -632,4 +703,5 @@
## file: unknown
##
CONFIG_MYRI_SBUS=m
+CONFIG_NET_PCI=y
More information about the Kernel-svn-changes
mailing list