dm9000: locking bugfix

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index afa2065..62d732a 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -830,7 +830,7 @@ config ULTRA32
 
 config BFIN_MAC
        tristate "Blackfin on-chip MAC support"
-       depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537)
+       depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
        select CRC32
        select MII
        select PHYLIB
@@ -1040,6 +1040,17 @@ config NI65
          To compile this driver as a module, choose M here. The module
          will be called ni65.
 
+config DNET
+       tristate "Dave ethernet support (DNET)"
+       depends on NET_ETHERNET && HAS_IOMEM
+       select PHYLIB
+       help
+         The Dave ethernet interface (DNET) is found on Qong Board FPGA.
+         Say Y to include support for the DNET chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called dnet.
+
 source "drivers/net/tulip/Kconfig"
 
 config AT1700
@@ -1600,7 +1611,7 @@ config 8139_OLD_RX_RESET
          old RX-reset behavior.  If unsure, say N.
 
 config R6040
-       tristate "RDC R6040 Fast Ethernet Adapter support (EXPERIMENTAL)"
+       tristate "RDC R6040 Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
        select CRC32
        select MII
@@ -1638,6 +1649,22 @@ config EPIC100
          More specific information and updates are available from
          <http://www.scyld.com/network/epic100.html>.
 
+config SMSC9420
+       tristate "SMSC LAN9420 PCI ethernet adapter support"
+       depends on NET_PCI && PCI
+       select CRC32
+       select PHYLIB
+       select SMSC_PHY
+       help
+         This is a driver for SMSC's LAN9420 PCI ethernet adapter.
+         Say Y if you want it compiled into the kernel,
+         and read the Ethernet-HOWTO, available from
+         <http://www.linuxdoc.org/docs.html#howto>.
+
+         This driver is also available as a module. The module will be
+         called smsc9420.  If you want to compile it as a module, say M
+         here and read <file:Documentation/kbuild/modules.txt>
+
 config SUNDANCE
        tristate "Sundance Alta support"
        depends on NET_PCI && PCI
@@ -1813,7 +1840,7 @@ config 68360_ENET
 
 config FEC
        bool "FEC ethernet controller (of ColdFire CPUs)"
-       depends on M523x || M527x || M5272 || M528x || M520x
+       depends on M523x || M527x || M5272 || M528x || M520x || M532x
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire processors.
@@ -1827,9 +1854,10 @@ config FEC2
 
 config FEC_MPC52xx
        tristate "MPC52xx FEC driver"
-       depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
+       depends on PPC_MPC52xx && PPC_BESTCOMM
        select CRC32
        select PHYLIB
+       select PPC_BESTCOMM_FEC
        ---help---
          This option enables support for the MPC5200's on-chip
          Fast Ethernet Controller
@@ -2277,10 +2305,6 @@ config UGETH_MAGIC_PACKET
        bool "Magic Packet detection support"
        depends on UCC_GETH
 
-config UGETH_FILTERING
-       bool "Mac address filtering support"
-       depends on UCC_GETH
-
 config UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH
@@ -2329,6 +2353,17 @@ config ATL1E
          To compile this driver as a module, choose M here.  The module
          will be called atl1e.
 
+config ATL1C
+       tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       select MII
+       help
+         This driver supports the Atheros L1C gigabit ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1c.
+
 config JME
        tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
        depends on PCI
@@ -2386,9 +2421,14 @@ config CHELSIO_T1_1G
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           are using only 10G cards say 'N' here.
 
+config CHELSIO_T3_DEPENDS
+       tristate
+       depends on PCI && INET
+       default y
+
 config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"
-       depends on PCI && INET
+       depends on CHELSIO_T3_DEPENDS
        select FW_LOADER
        select INET_LRO
        help
@@ -2451,6 +2491,16 @@ config IXGBE_DCA
          driver.  DCA is a method for warming the CPU cache before data
          is used, with the intent of lessening the impact of cache misses.
 
+config IXGBE_DCB
+       bool "Data Center Bridging (DCB) Support"
+       default n
+       depends on IXGBE && DCB
+       ---help---
+         Say Y here if you want to use Data Center Bridging (DCB) in the
+         driver.
+
+         If unsure, say N.
+
 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
@@ -2580,12 +2630,16 @@ config QLGE
 
 source "drivers/net/sfc/Kconfig"
 
+source "drivers/net/benet/Kconfig"
+
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
+source "drivers/net/wimax/Kconfig"
+
 source "drivers/net/usb/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"
@@ -2627,7 +2681,7 @@ config RIONET_RX_SIZE
        default "128"
 
 config FDDI
-       bool "FDDI driver support"
+       tristate "FDDI driver support"
        depends on (PCI || EISA || TC)
        help
          Fiber Distributed Data Interface is a high speed local area network