centralize NETDEV_10000: IXGB, S2IO
arm seems quite inconsistent in enabling/disabling those network drivers as bonus point kill duplicate tokenring mips/mipsel driver variables svn path=/dists/trunk/linux-2.6/; revision=9814
This commit is contained in:
parent
b4fe7cd5f1
commit
d4d77685af
|
@ -500,8 +500,6 @@ CONFIG_R8169_VLAN=y
|
|||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
CONFIG_STRIP=m
|
||||
CONFIG_WAVELAN=m
|
||||
|
|
|
@ -464,8 +464,6 @@ CONFIG_R8169=m
|
|||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
CONFIG_STRIP=m
|
||||
CONFIG_PCMCIA_WAVELAN=m
|
||||
|
|
|
@ -665,7 +665,6 @@ CONFIG_SKGE=m
|
|||
#
|
||||
# Ethernet (10000 Mbit)
|
||||
#
|
||||
CONFIG_CHELSIO_T1=m
|
||||
# CONFIG_IXGB is not set
|
||||
# CONFIG_S2IO is not set
|
||||
|
||||
|
|
|
@ -696,7 +696,6 @@ CONFIG_ACENIC=m
|
|||
# CONFIG_CHELSIO_T1 is not set
|
||||
# CONFIG_IXGB is not set
|
||||
# CONFIG_S2IO is not set
|
||||
CONFIG_MYRI10GE=m
|
||||
|
||||
#
|
||||
# Token Ring devices
|
||||
|
|
|
@ -1553,18 +1553,21 @@ CONFIG_SKY2=m
|
|||
CONFIG_QLA3XXX=m
|
||||
CONFIG_ATL1=m
|
||||
CONFIG_NETDEV_10000=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_CHELSIO_T1=m
|
||||
CONFIG_CHELSIO_T1_1G=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_CHELSIO_T3=m
|
||||
CONFIG_IXGBE=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_IXGB_NAPI=y
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_S2IO_NAPI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
CONFIG_NIU=m
|
||||
CONFIG_MLX4_CORE=m
|
||||
CONFIG_MLX4_DEBUG=y
|
||||
|
||||
CONFIG_TEHUTI=m
|
||||
CONFIG_IBMOL=m
|
||||
CONFIG_TMS380TR=m
|
||||
|
|
|
@ -318,8 +318,6 @@ CONFIG_R8169_VLAN=y
|
|||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
# CONFIG_TR is not set
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
# CONFIG_STRIP is not set
|
||||
|
|
|
@ -590,8 +590,6 @@ CONFIG_R8169_VLAN=y
|
|||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
CONFIG_STRIP=m
|
||||
CONFIG_ARLAN=m
|
||||
|
|
|
@ -45,8 +45,6 @@ CONFIG_R8169_VLAN=y
|
|||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
CONFIG_STRIP=m
|
||||
CONFIG_PCMCIA_WAVELAN=m
|
||||
|
|
|
@ -1225,19 +1225,6 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2=m
|
||||
CONFIG_QLA3XXX=m
|
||||
|
||||
#
|
||||
# Ethernet (10000 Mbit)
|
||||
#
|
||||
CONFIG_CHELSIO_T1=m
|
||||
CONFIG_CHELSIO_T1_1G=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_IXGB_NAPI=y
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_S2IO_NAPI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
|
||||
#
|
||||
# Wireless LAN (non-hamradio)
|
||||
#
|
||||
|
|
|
@ -1299,22 +1299,8 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2=m
|
||||
CONFIG_QLA3XXX=m
|
||||
CONFIG_ATL1=m
|
||||
CONFIG_NETDEV_10000=y
|
||||
CONFIG_CHELSIO_T1=m
|
||||
CONFIG_CHELSIO_T1_1G=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_CHELSIO_T3=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_IXGB_NAPI=y
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_S2IO_NAPI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
|
||||
CONFIG_TR=y
|
||||
CONFIG_IBMOL=m
|
||||
CONFIG_TMS380TR=m
|
||||
CONFIG_TMSPCI=m
|
||||
CONFIG_ABYSS=m
|
||||
|
||||
#
|
||||
# Wireless LAN
|
||||
|
|
|
@ -1225,19 +1225,6 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2=m
|
||||
CONFIG_QLA3XXX=m
|
||||
|
||||
#
|
||||
# Ethernet (10000 Mbit)
|
||||
#
|
||||
CONFIG_CHELSIO_T1=m
|
||||
CONFIG_CHELSIO_T1_1G=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_IXGB_NAPI=y
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_S2IO_NAPI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
|
||||
#
|
||||
# Wireless LAN (non-hamradio)
|
||||
#
|
||||
|
|
|
@ -1299,22 +1299,8 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2=m
|
||||
CONFIG_QLA3XXX=m
|
||||
CONFIG_ATL1=m
|
||||
CONFIG_NETDEV_10000=y
|
||||
CONFIG_CHELSIO_T1=m
|
||||
CONFIG_CHELSIO_T1_1G=y
|
||||
CONFIG_CHELSIO_T1_NAPI=y
|
||||
CONFIG_CHELSIO_T3=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_IXGB_NAPI=y
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_S2IO_NAPI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
|
||||
CONFIG_TR=y
|
||||
CONFIG_IBMOL=m
|
||||
CONFIG_TMS380TR=m
|
||||
CONFIG_TMSPCI=m
|
||||
CONFIG_ABYSS=m
|
||||
|
||||
#
|
||||
# Wireless LAN
|
||||
|
|
|
@ -350,8 +350,6 @@ CONFIG_VIA_VELOCITY=m
|
|||
CONFIG_TIGON3=m
|
||||
CONFIG_BNX2=m
|
||||
CONFIG_MV643XX_ETH=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_S2IO=m
|
||||
CONFIG_WLAN_PRE80211=y
|
||||
CONFIG_STRIP=m
|
||||
CONFIG_PCMCIA_WAVELAN=m
|
||||
|
|
|
@ -43,7 +43,6 @@ CONFIG_OBP_FLASH=m
|
|||
CONFIG_FB_PM2=y
|
||||
# CONFIG_I2C_VIAPRO is not set
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_SCSI_SYM53C8XX_2=m
|
||||
CONFIG_SPARC32_COMPAT=y
|
||||
# CONFIG_BLK_DEV_AMD74XX is not set
|
||||
|
@ -54,7 +53,6 @@ CONFIG_USB_MDC800=m
|
|||
# CONFIG_SPARC64_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_I2C_ALI1535 is not set
|
||||
# CONFIG_I2C_ALI1563 is not set
|
||||
CONFIG_S2IO=m
|
||||
# CONFIG_SND_RTCTIMER is not set
|
||||
# CONFIG_HID_FF is not set
|
||||
CONFIG_I2C_ALGOPCA=m
|
||||
|
|
|
@ -43,7 +43,6 @@ CONFIG_OBP_FLASH=m
|
|||
CONFIG_FB_PM2=y
|
||||
# CONFIG_I2C_VIAPRO is not set
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_SCSI_SYM53C8XX_2=m
|
||||
CONFIG_SPARC32_COMPAT=y
|
||||
# CONFIG_BLK_DEV_AMD74XX is not set
|
||||
|
@ -54,7 +53,6 @@ CONFIG_USB_MDC800=m
|
|||
# CONFIG_SPARC64_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_I2C_ALI1535 is not set
|
||||
# CONFIG_I2C_ALI1563 is not set
|
||||
CONFIG_S2IO=m
|
||||
# CONFIG_SND_RTCTIMER is not set
|
||||
# CONFIG_HID_FF is not set
|
||||
CONFIG_I2C_ALGOPCA=m
|
||||
|
|
Loading…
Reference in New Issue