Reorder Kconfig according to drivers/net reorganisation

Also add explicit CONFIG_NET_VENDOR_*=y as appropriate (this default
will probably go away some day).

This covers generic and x86 config files only.

svn path=/dists/trunk/linux-2.6/; revision=18310
This commit is contained in:
Ben Hutchings 2011-11-22 08:05:28 +00:00
parent dd9a095d25
commit fb649e9731
6 changed files with 490 additions and 184 deletions

355
debian/config/config vendored
View File

@ -1653,79 +1653,6 @@ CONFIG_EQUALIZER=m
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_MII=m
CONFIG_NET_ETHERNET=y
CONFIG_CASSINI=m
CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set
CONFIG_ETHOC=m
CONFIG_DNET=m
CONFIG_PCNET32=m
CONFIG_KSZ884X_PCI=m
CONFIG_R6040=m
CONFIG_SMSC9420=m
CONFIG_TLAN=m
CONFIG_KS8842=m
CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_SC92031=m
# CONFIG_NET_POCKET is not set
CONFIG_ATL2=m
CONFIG_NETDEV_1000=y
CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IP1000=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
CONFIG_IGBVF=m
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_CNIC=m
CONFIG_QLA3XXX=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
CONFIG_JME=m
# CONFIG_PCH_GBE is not set
CONFIG_NETDEV_10000=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T3=m
CONFIG_CHELSIO_T4=m
CONFIG_CHELSIO_T4VF=m
CONFIG_ENIC=m
CONFIG_IXGBE=m
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
CONFIG_IXGBEVF=m
CONFIG_IXGB=m
CONFIG_S2IO=m
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
CONFIG_NETXEN_NIC=m
CONFIG_NIU=m
CONFIG_MLX4_EN=m
CONFIG_MLX4_DEBUG=y
CONFIG_TEHUTI=m
CONFIG_BNX2X=m
CONFIG_QLCNIC=m
CONFIG_QLGE=m
CONFIG_BNA=m
CONFIG_DEFXX=m
# CONFIG_DEFXX_MMIO is not set
CONFIG_PPP=m
@ -1759,11 +1686,6 @@ CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
##
## file: drivers/net/benet/Kconfig
##
CONFIG_BE2NET=m
##
## file: drivers/net/can/Kconfig
##
@ -1805,6 +1727,266 @@ CONFIG_CAN_SOFTING_CS=m
CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m
##
## file: drivers/net/ethernet/Kconfig
##
CONFIG_ETHERNET=y
CONFIG_DNET=m
CONFIG_JME=m
CONFIG_ETHOC=m
##
## file: drivers/net/ethernet/alteon/Kconfig
##
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
##
## file: drivers/net/ethernet/amd/Kconfig
##
CONFIG_NET_VENDOR_AMD=y
CONFIG_PCNET32=m
##
## file: drivers/net/ethernet/atheros/Kconfig
##
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
##
## file: drivers/net/ethernet/broadcom/Kconfig
##
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_BNX2=m
CONFIG_CNIC=m
CONFIG_TIGON3=m
CONFIG_BNX2X=m
##
## file: drivers/net/ethernet/brocade/Kconfig
##
CONFIG_NET_VENDOR_BROCADE=y
##
## file: drivers/net/ethernet/brocade/bna/Kconfig
##
CONFIG_BNA=m
##
## file: drivers/net/ethernet/chelsio/Kconfig
##
CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T3=m
CONFIG_CHELSIO_T4=m
CONFIG_CHELSIO_T4VF=m
##
## file: drivers/net/ethernet/cisco/Kconfig
##
CONFIG_NET_VENDOR_CISCO=y
##
## file: drivers/net/ethernet/cisco/enic/Kconfig
##
CONFIG_ENIC=m
##
## file: drivers/net/ethernet/dlink/Kconfig
##
CONFIG_NET_VENDOR_DLINK=y
CONFIG_DL2K=m
##
## file: drivers/net/ethernet/emulex/Kconfig
##
CONFIG_NET_VENDOR_EMULEX=y
##
## file: drivers/net/ethernet/emulex/benet/Kconfig
##
CONFIG_BE2NET=m
##
## file: drivers/net/ethernet/icplus/Kconfig
##
CONFIG_IP1000=m
##
## file: drivers/net/ethernet/intel/Kconfig
##
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=m
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
CONFIG_IXGBEVF=m
##
## file: drivers/net/ethernet/marvell/Kconfig
##
CONFIG_NET_VENDOR_MARVELL=y
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
##
## file: drivers/net/ethernet/mellanox/Kconfig
##
CONFIG_NET_VENDOR_MELLANOX=y
##
## file: drivers/net/ethernet/mellanox/mlx4/Kconfig
##
CONFIG_MLX4_EN=m
CONFIG_MLX4_DEBUG=y
##
## file: drivers/net/ethernet/micrel/Kconfig
##
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
##
## file: drivers/net/ethernet/microchip/Kconfig
##
CONFIG_NET_VENDOR_MICROCHIP=y
CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set
##
## file: drivers/net/ethernet/myricom/Kconfig
##
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
##
## file: drivers/net/ethernet/natsemi/Kconfig
##
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NS83820=m
##
## file: drivers/net/ethernet/neterion/Kconfig
##
CONFIG_NET_VENDOR_EXAR=y
CONFIG_S2IO=m
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
##
## file: drivers/net/ethernet/oki-semi/Kconfig
##
CONFIG_NET_VENDOR_OKI=y
##
## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
##
# CONFIG_PCH_GBE is not set
##
## file: drivers/net/ethernet/packetengines/Kconfig
##
CONFIG_NET_PACKET_ENGINE=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
##
## file: drivers/net/ethernet/qlogic/Kconfig
##
CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
##
## file: drivers/net/ethernet/rdc/Kconfig
##
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
CONFIG_NET_VENDOR_REALTEK=y
CONFIG_R8169=m
##
## file: drivers/net/ethernet/sfc/Kconfig
##
CONFIG_SFC=m
CONFIG_SFC_MTD=y
##
## file: drivers/net/ethernet/silan/Kconfig
##
CONFIG_NET_VENDOR_SILAN=y
CONFIG_SC92031=m
##
## file: drivers/net/ethernet/sis/Kconfig
##
CONFIG_NET_VENDOR_SIS=y
CONFIG_SIS190=m
##
## file: drivers/net/ethernet/smsc/Kconfig
##
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMSC9420=m
##
## file: drivers/net/ethernet/stmicro/Kconfig
##
CONFIG_NET_VENDOR_STMICRO=y
##
## file: drivers/net/ethernet/stmicro/stmmac/Kconfig
##
# CONFIG_STMMAC_ETH is not set
##
## file: drivers/net/ethernet/sun/Kconfig
##
CONFIG_NET_VENDOR_SUN=y
CONFIG_CASSINI=m
CONFIG_NIU=m
##
## file: drivers/net/ethernet/tehuti/Kconfig
##
CONFIG_NET_VENDOR_TEHUTI=y
CONFIG_TEHUTI=m
##
## file: drivers/net/ethernet/ti/Kconfig
##
CONFIG_NET_VENDOR_TI=y
CONFIG_TLAN=m
##
## file: drivers/net/ethernet/via/Kconfig
##
CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_VELOCITY=m
##
## file: drivers/net/hamradio/Kconfig
##
@ -1836,11 +2018,6 @@ CONFIG_KSDAZZLE_DONGLE=m
CONFIG_KS959_DONGLE=m
CONFIG_MCS_FIR=m
##
## file: drivers/net/pcmcia/Kconfig
##
CONFIG_PCMCIA_IBMTR=m
##
## file: drivers/net/phy/Kconfig
##
@ -1864,21 +2041,11 @@ CONFIG_FIXED_PHY=y
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_GPIO is not set
##
## file: drivers/net/sfc/Kconfig
##
CONFIG_SFC=m
CONFIG_SFC_MTD=y
##
## file: drivers/net/stmmac/Kconfig
##
# CONFIG_STMMAC_ETH is not set
##
## file: drivers/net/tokenring/Kconfig
##
CONFIG_TR=y
CONFIG_PCMCIA_IBMTR=m
CONFIG_IBMTR=m
CONFIG_IBMOL=m
CONFIG_IBMLS=m

View File

@ -59,18 +59,34 @@ CONFIG_MCA_LEGACY=y
# CONFIG_MTD_XIP is not set
##
## file: drivers/net/Kconfig
## file: drivers/net/ethernet/8390/Kconfig
##
CONFIG_ELMC=m
CONFIG_ELMC_II=m
CONFIG_NET_VENDOR_8390=y
CONFIG_ES3210=m
CONFIG_LNE390=m
CONFIG_NE2_MCA=m
CONFIG_NE3210=m
CONFIG_ULTRAMCA=m
CONFIG_ULTRA32=m
CONFIG_NI5010=m
CONFIG_NE2_MCA=m
##
## file: drivers/net/ethernet/i825xx/Kconfig
##
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELMC=m
CONFIG_ELMC_II=m
##
## file: drivers/net/ethernet/natsemi/Kconfig
##
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_IBMLANA=m
CONFIG_LNE390=m
CONFIG_NE3210=m
CONFIG_ES3210=m
##
## file: drivers/net/ethernet/racal/Kconfig
##
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NI5010=m
##
## file: drivers/net/hamradio/Kconfig

View File

@ -27,7 +27,7 @@ CONFIG_M686=y
CONFIG_I2C_STUB=m
##
## file: drivers/net/Kconfig
## file: drivers/net/ethernet/racal/Kconfig
##
# CONFIG_NI5010 is not set

View File

@ -805,35 +805,6 @@ CONFIG_MTD_NAND_PLATFORM=m
##
CONFIG_DUMMY=m
CONFIG_NET_SB1000=m
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
CONFIG_HP100=m
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_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# 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_ATP=m
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_FDDI=y
@ -858,6 +829,131 @@ CONFIG_ARCNET_COM90xxIO=m
CONFIG_ARCNET_RIM_I=m
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
##
## file: drivers/net/ethernet/8390/Kconfig
##
CONFIG_NET_VENDOR_8390=y
CONFIG_PCMCIA_AXNET=m
CONFIG_NE2K_PCI=m
CONFIG_PCMCIA_PCNET=m
##
## file: drivers/net/ethernet/adaptec/Kconfig
##
CONFIG_NET_VENDOR_ADAPTEC=y
CONFIG_ADAPTEC_STARFIRE=m
##
## file: drivers/net/ethernet/amd/Kconfig
##
CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCMCIA_NMCLAN=m
##
## file: drivers/net/ethernet/broadcom/Kconfig
##
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
##
## file: drivers/net/ethernet/dlink/Kconfig
##
CONFIG_NET_VENDOR_DLINK=y
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
##
## file: drivers/net/ethernet/fujitsu/Kconfig
##
CONFIG_NET_VENDOR_FUJITSU=y
CONFIG_PCMCIA_FMVJ18X=m
##
## file: drivers/net/ethernet/hp/Kconfig
##
CONFIG_NET_VENDOR_HP=y
CONFIG_HP100=m
##
## file: drivers/net/ethernet/intel/Kconfig
##
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m
##
## file: drivers/net/ethernet/natsemi/Kconfig
##
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
##
## file: drivers/net/ethernet/nvidia/Kconfig
##
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
CONFIG_NET_VENDOR_REALTEK=y
CONFIG_ATP=m
CONFIG_8139CP=m
CONFIG_8139TOO=m
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
##
## file: drivers/net/ethernet/sis/Kconfig
##
CONFIG_NET_VENDOR_SIS=y
CONFIG_SIS900=m
##
## file: drivers/net/ethernet/smsc/Kconfig
##
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
##
## file: drivers/net/ethernet/sun/Kconfig
##
CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
##
## file: drivers/net/ethernet/via/Kconfig
##
CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
##
## file: drivers/net/ethernet/xircom/Kconfig
##
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_PCMCIA_XIRC2PS=m
##
## file: drivers/net/irda/Kconfig
@ -872,20 +968,6 @@ CONFIG_ALI_FIR=m
CONFIG_VLSI_FIR=m
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
##

View File

@ -237,48 +237,89 @@ CONFIG_MTD_SCx200_DOCFLASH=m
CONFIG_MTD_PCMCIA=m
# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
##
## file: drivers/net/Kconfig
##
CONFIG_EL1=m
CONFIG_EL2=m
CONFIG_ELPLUS=m
CONFIG_EL16=m
CONFIG_EL3=m
CONFIG_3C515=m
CONFIG_LANCE=m
CONFIG_NET_VENDOR_SMC=y
CONFIG_WD80x3=m
CONFIG_ULTRA=m
CONFIG_SMC9194=m
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NI52=m
CONFIG_NI65=m
CONFIG_AT1700=m
CONFIG_DEPCA=m
CONFIG_NET_ISA=y
CONFIG_E2100=m
CONFIG_EWRK3=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_ZNET=m
CONFIG_SEEQ8005=m
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_CS89x0=m
CONFIG_8139TOO_PIO=y
CONFIG_TLAN=m
##
## file: drivers/net/arcnet/Kconfig
##
CONFIG_ARCNET_COM20020_ISA=m
##
## file: drivers/net/ethernet/3com/Kconfig
##
CONFIG_NET_VENDOR_3COM=y
CONFIG_EL1=m
CONFIG_EL3=m
CONFIG_3C515=m
##
## file: drivers/net/ethernet/8390/Kconfig
##
CONFIG_NET_VENDOR_8390=y
CONFIG_EL2=m
CONFIG_AC3200=m
CONFIG_E2100=m
CONFIG_HPLAN_PLUS=m
CONFIG_HPLAN=m
CONFIG_NE2000=m
CONFIG_WD80x3=m
##
## file: drivers/net/ethernet/amd/Kconfig
##
CONFIG_NET_VENDOR_AMD=y
CONFIG_LANCE=m
CONFIG_ULTRA=m
CONFIG_DEPCA=m
CONFIG_NI65=m
##
## file: drivers/net/ethernet/cirrus/Kconfig
##
CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_CS89x0=m
##
## file: drivers/net/ethernet/dec/Kconfig
##
CONFIG_NET_VENDOR_DEC=y
CONFIG_EWRK3=m
##
## file: drivers/net/ethernet/fujitsu/Kconfig
##
CONFIG_NET_VENDOR_FUJITSU=y
CONFIG_AT1700=m
CONFIG_ETH16I=m
##
## file: drivers/net/ethernet/i825xx/Kconfig
##
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELPLUS=m
CONFIG_EL16=m
CONFIG_APRICOT=m
CONFIG_EEXPRESS=m
CONFIG_EEXPRESS_PRO=m
CONFIG_LP486E=m
CONFIG_NI52=m
CONFIG_ZNET=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
CONFIG_8139TOO_PIO=y
##
## file: drivers/net/ethernet/seeq/Kconfig
##
CONFIG_NET_VENDOR_SEEQ=y
CONFIG_SEEQ8005=m
##
## file: drivers/net/ethernet/smsc/Kconfig
##
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
##
## file: drivers/net/hamradio/Kconfig
##

View File

@ -80,7 +80,7 @@ CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
##
## file: drivers/net/Kconfig
## file: drivers/net/ethernet/realtek/Kconfig
##
# CONFIG_8139TOO_PIO is not set