1 files changed, 83 insertions, 58 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 79eade7e9d91..38ac6796fc48 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -190,7 +190,7 @@ config MII
 
 config MACB
         tristate "Atmel MACB support"
-        depends on NET_ETHERNET && AVR32
+        depends on NET_ETHERNET && (AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263)
         select MII
         help
           The Atmel MACB ethernet interface is found on many AT32 and AT91
@@ -235,16 +235,6 @@ config BMAC
           To compile this driver as a module, choose M here: the module
           will be called bmac.
 
-config OAKNET
-        tristate "National DP83902AV (Oak ethernet) support"
-        depends on NET_ETHERNET && PPC && BROKEN
-        select CRC32
-        help
-          Say Y if your machine has this type of Ethernet network card.
-
-          To compile this driver as a module, choose M here: the module
-          will be called oaknet.
-
 config ARIADNE
         tristate "Ariadne support"
         depends on NET_ETHERNET && ZORRO
@@ -1155,21 +1145,6 @@ config SEEQ8005
           <file:Documentation/networking/net-modules.txt>. The module
           will be called seeq8005.
 
-config SKMC
-        tristate "SKnet MCA support"
-        depends on NET_ETHERNET && MCA && BROKEN
-        ---help---
-          These are Micro Channel Ethernet adapters. You need to say Y to "MCA
-          support" in order to use this driver.  Supported cards are the SKnet
-          Junior MC2 and the SKnet MC2(+).  The driver automatically
-          distinguishes between the two cards. Note that using multiple boards
-          of different type hasn't been tested with this driver.  Say Y if you
-          have one of these Ethernet adapters.
-
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/networking/net-modules.txt>. The module
-          will be called sk_mca.
-
 config NE2_MCA
         tristate "NE/2 (ne2000 MCA version) support"
         depends on NET_ETHERNET && MCA_LEGACY
@@ -1309,8 +1284,8 @@ config PCNET32
           will be called pcnet32.
 
 config PCNET32_NAPI
-        bool "Use RX polling (NAPI) (EXPERIMENTAL)"
-        depends on PCNET32 && EXPERIMENTAL
+        bool "Use RX polling (NAPI)"
+        depends on PCNET32
         help
           NAPI is a new driver API designed to reduce CPU and interrupt load
           when the driver is receiving lots of packets from the card. It is
@@ -1788,6 +1763,18 @@ config LAN_SAA9730
           workstations.
           See <http://www.semiconductors.philips.com/pip/SAA9730_flyer_1>.
 
+config SC92031
+        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+        depends on NET_PCI && PCI && EXPERIMENTAL
+        select CRC32
+        ---help---
+          This is a driver for the Fast Ethernet PCI network cards based on
+          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+          have one of these, say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called sc92031.  This is recommended.
+
 config NET_POCKET
         bool "Pocket and portable adapters"
         depends on NET_ETHERNET && PARPORT
@@ -2138,14 +2125,16 @@ config SKY2
           will be called sky2.  This is recommended.
 
 config SK98LIN
-        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
+        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"
         depends on PCI
         ---help---
           Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
           compliant Gigabit Ethernet Adapter.
 
-          This driver supports the original Yukon chipset. A cleaner driver is 
-          also available (skge) which seems to work better than this one.
+          This driver supports the original Yukon chipset. This driver is
+          deprecated and will be removed from the kernel in the near future,
+          it has been replaced by the skge driver. skge is cleaner and
+          seems to work better.
 
           This driver does not support the newer Yukon2 chipset. A separate
           driver, sky2, is provided to support Yukon2-based adapters.
@@ -2318,27 +2307,6 @@ config MV643XX_ETH
           chipset which is used in the Momenco Ocelot C and Jaguar ATX and
           Pegasos II, amongst other PPC and MIPS boards.
 
-config MV643XX_ETH_0
-        bool "MV-643XX Port 0"
-        depends on MV643XX_ETH
-        help
-          This enables support for Port 0 of the Marvell MV643XX Gigabit
-          Ethernet.
-
-config MV643XX_ETH_1
-        bool "MV-643XX Port 1"
-        depends on MV643XX_ETH
-        help
-          This enables support for Port 1 of the Marvell MV643XX Gigabit
-          Ethernet.
-
-config MV643XX_ETH_2
-        bool "MV-643XX Port 2"
-        depends on MV643XX_ETH
-        help
-          This enables support for Port 2 of the Marvell MV643XX Gigabit
-          Ethernet.
-
 config QLA3XXX
         tristate "QLogic QLA3XXX Network Driver Support"
         depends on PCI
@@ -2348,6 +2316,17 @@ config QLA3XXX
           To compile this driver as a module, choose M here: the module
           will be called qla3xxx.
 
+config ATL1
+        tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        select CRC32
+        select MII
+        help
+          This driver supports the Attansic L1 gigabit ethernet adapter.
+
+          To compile this driver as a module, choose M here.  The module
+          will be called atl1.
+
 endmenu
 
 #
@@ -2392,6 +2371,24 @@ config CHELSIO_T1_NAPI
           NAPI is a driver API designed to reduce CPU and interrupt load
           when the driver is receiving lots of packets from the card.
 
+config CHELSIO_T3
+        tristate "Chelsio Communications T3 10Gb Ethernet support"
+        depends on PCI
+        help
+          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
+          adapters.
+
+          For general information about Chelsio and our products, visit
+          our website at <http://www.chelsio.com>.
+
+          For customer support, please visit our customer support page at
+          <http://www.chelsio.com/support.htm>.
+
+          Please send feedback to <linux-bugs@chelsio.com>.
+
+          To compile this driver as a module, choose M here: the module
+          will be called cxgb3.
+
 config EHEA
         tristate "eHEA Ethernet support"
         depends on IBMEBUS
@@ -2488,6 +2485,13 @@ config NETXEN_NIC
         help
           This enables the support for NetXen's Gigabit Ethernet card.
 
+config PASEMI_MAC
+        tristate "PA Semi 1/10Gbit MAC"
+        depends on PPC64 && PCI
+        help
+          This driver supports the on-chip 1/10Gbit Ethernet controller on
+          PA Semi's PWRficient line of chips.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"
@@ -2522,7 +2526,7 @@ config RIONET_RX_SIZE
 
 config FDDI
         bool "FDDI driver support"
-        depends on (PCI || EISA)
+        depends on (PCI || EISA || TC)
         help
           Fiber Distributed Data Interface is a high speed local area network
           design; essentially a replacement for high speed Ethernet. FDDI can
@@ -2532,15 +2536,36 @@ config FDDI
           will say N.
 
 config DEFXX
-        tristate "Digital DEFEA and DEFPA adapter support"
-        depends on FDDI && (PCI || EISA)
-        help
-          This is support for the DIGITAL series of EISA (DEFEA) and PCI
-          (DEFPA) controllers which can connect you to a local FDDI network.
+        tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
+        depends on FDDI && (PCI || EISA || TC)
+        ---help---
+          This is support for the DIGITAL series of TURBOchannel (DEFTA),
+          EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
+          to a local FDDI network.
+
+          To compile this driver as a module, choose M here: the module
+          will be called defxx.  If unsure, say N.
+
+config DEFXX_MMIO
+        bool
+        prompt "Use MMIO instead of PIO" if PCI || EISA
+        depends on DEFXX
+        default n if PCI || EISA
+        default y
+        ---help---
+          This instructs the driver to use EISA or PCI memory-mapped I/O
+          (MMIO) as appropriate instead of programmed I/O ports (PIO).
+          Enabling this gives an improvement in processing time in parts
+          of the driver, but it may cause problems with EISA (DEFEA)
+          adapters.  TURBOchannel does not have the concept of I/O ports,
+          so MMIO is always used for these (DEFTA) adapters.
+
+          If unsure, say N.
 
 config SKFP
         tristate "SysKonnect FDDI PCI support"
         depends on FDDI && PCI
+        select BITREVERSE
         ---help---
           Say Y here if you have a SysKonnect FDDI PCI adapter.
           The following adapters are supported by this driver: