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 99ae44e..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
@@ -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
@@ -1997,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
@@ -2394,7 +2405,7 @@ config EHEA
          will be called ehea.
 
 config ENIC
-       tristate "E, the Cisco 10G Ethernet NIC"
+       tristate "Cisco 10G Ethernet NIC support"
        depends on PCI && INET
        select INET_LRO
        help
@@ -2404,7 +2415,6 @@ 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
@@ -2420,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
@@ -2456,7 +2471,6 @@ 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,
@@ -2468,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