igb: add IGB_DCA instead of selecting INTEL_IOATDMA

[pandora-kernel.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9df7bb9..c7f020c 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -888,7 +888,7 @@ config SMC91X
        select CRC32
        select MII
        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
-               SOC_AU1X00 || BLACKFIN || MN10300
+               MIPS || BLACKFIN || MN10300
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -1819,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---
@@ -1846,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
@@ -1933,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)
@@ -2001,6 +2003,11 @@ config IGB_LRO
 
          If in doubt, say N.
 
+config IGB_DCA
+       bool "Enable DCA"
+       default y
+       depends on IGB && DCA && !(IGB=y && DCA=m)
+
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
@@ -2052,6 +2059,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.
 
@@ -2268,7 +2276,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
@@ -2287,12 +2295,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.
@@ -2308,6 +2317,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
 
 #
@@ -2383,6 +2404,13 @@ config EHEA
          To compile the driver as a module, choose M here. The module
          will be called ehea.
 
+config ENIC
+       tristate "Cisco 10G Ethernet NIC support"
+       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
@@ -2402,6 +2430,11 @@ config IXGBE
          To compile this driver as a module, choose M here. The module
          will be called ixgbe.
 
+config IXGBE_DCA
+       bool
+       default y
+       depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+
 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
@@ -2449,6 +2482,11 @@ config MYRI10GE
          To compile this driver as a module, choose M here. The module
          will be called myri10ge.
 
+config MYRI10GE_DCA
+       bool
+       default y
+       depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+
 config NETXEN_NIC
        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
        depends on PCI
@@ -2502,6 +2540,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