1 files changed, 55 insertions, 15 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4a11296a9514..e9d529442b06 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1386,7 +1386,8 @@ config FORCEDETH_NAPI
 
 config CS89x0
         tristate "CS89x0 support"
-        depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)
+        depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
+                || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
         ---help---
           Support for CS89x0 chipset based Ethernet cards. If you have a
           network (Ethernet) card of this type, say Y and read the
@@ -1397,6 +1398,11 @@ config CS89x0
           To compile this driver as a module, choose M here. The module
           will be called cs89x0.
 
+config CS89x0_NONISA_IRQ
+        def_bool y
+        depends on CS89x0 != n
+        depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS
+
 config TC35815
         tristate "TOSHIBA TC35815 Ethernet support"
         depends on NET_PCI && PCI && MIPS
@@ -1813,7 +1819,7 @@ config FEC2
 
 config FEC_MPC52xx
         tristate "MPC52xx FEC driver"
-        depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC
+        depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
         select CRC32
         select PHYLIB
         ---help---
@@ -1840,6 +1846,17 @@ config NE_H8300
           Say Y here if you want to use the NE2000 compatible
           controller on the Renesas H8/300 processor.
 
+config ATL2
+        tristate "Atheros L2 Fast Ethernet support"
+        depends on PCI
+        select CRC32
+        select MII
+        help
+          This driver supports the Atheros L2 fast ethernet adapter.
+
+          To compile this driver as a module, choose M here.  The module
+          will be called atl2.
+
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET
@@ -1927,15 +1944,6 @@ config E1000
           To compile this driver as a module, choose M here. The module
           will be called e1000.
 
-config E1000_DISABLE_PACKET_SPLIT
-        bool "Disable Packet Split for PCI express adapters"
-        depends on E1000
-        help
-          Say Y here if you want to use the legacy receive path for PCI express
-          hardware.
-
-          If in doubt, say N.
-
 config E1000E
         tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
         depends on PCI && (!SPARC32 || BROKEN)
@@ -2046,6 +2054,7 @@ config R8169
         tristate "Realtek 8169 gigabit ethernet support"
         depends on PCI
         select CRC32
+        select MII
         ---help---
           Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
 
@@ -2262,7 +2271,7 @@ config UGETH_TX_ON_DEMAND
 config MV643XX_ETH
         tristate "Marvell Discovery (643XX) and Orion ethernet support"
         depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
-        select MII
+        select PHYLIB
         help
           This driver supports the gigabit ethernet MACs in the
           Marvell Discovery PPC/MIPS chipset family (MV643XX) and
@@ -2281,12 +2290,13 @@ config QLA3XXX
           will be called qla3xxx.
 
 config ATL1
-        tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
+        tristate "Atheros/Attansic L1 Gigabit Ethernet support"
+        depends on PCI
         select CRC32
         select MII
         help
-          This driver supports the Attansic L1 gigabit ethernet adapter.
+          This driver supports the Atheros/Attansic L1 gigabit ethernet
+          adapter.
 
           To compile this driver as a module, choose M here.  The module
           will be called atl1.
@@ -2302,6 +2312,18 @@ config ATL1E
           To compile this driver as a module, choose M here.  The module
           will be called atl1e.
 
+config JME
+        tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          This driver supports the PCI-Express gigabit ethernet adapters
+          based on JMicron JMC250 chipset.
+
+          To compile this driver as a module, choose M here. The module
+          will be called jme.
+
 endif # NETDEV_1000
 
 #
@@ -2377,10 +2399,18 @@ config EHEA
           To compile the driver as a module, choose M here. The module
           will be called ehea.
 
+config ENIC
+        tristate "E, the Cisco 10G Ethernet NIC"
+        depends on PCI && INET
+        select INET_LRO
+        help
+          This enables the support for the Cisco 10G Ethernet card.
+
 config IXGBE
         tristate "Intel(R) 10GbE PCI Express adapters support"
         depends on PCI && INET
         select INET_LRO
+        select INTEL_IOATDMA
         ---help---
           This driver supports Intel(R) 10GbE PCI Express family of
           adapters.  For more information on how to identify your adapter, go
@@ -2432,6 +2462,7 @@ config MYRI10GE
         select FW_LOADER
         select CRC32
         select INET_LRO
+        select INTEL_IOATDMA
         ---help---
           This driver supports Myricom Myri-10G Dual Protocol interface in
           Ethernet mode. If the eeprom on your board is not recent enough,
@@ -2496,6 +2527,15 @@ config BNX2X
           To compile this driver as a module, choose M here: the module
           will be called bnx2x.  This is recommended.
 
+config QLGE
+        tristate "QLogic QLGE 10Gb Ethernet Driver Support"
+        depends on PCI
+        help
+          This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called qlge.
+
 source "drivers/net/sfc/Kconfig"
 
 endif # NETDEV_10000