Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize

author: David S. Miller <davem@davemloft.net> 2011-08-11 01:05:54 -0400
committer: David S. Miller <davem@davemloft.net> 2011-08-11 01:05:54 -0400
commit: 628a604842b68cb0fc483e7cd5fcfb836be633d5 (patch)
tree: 686b7f3eb491a9626c72b449e34baa3df3c303a9
parent: 9de79c127cccecb11ae6a21ab1499e87aa222880 (diff)
parent: 115978859272b958366d4a08c99a24f9625fa663 (diff)
355 files changed, 1699 insertions, 1467 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 51d42fbc8dc4..5b368ccf7572 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -117,20 +117,20 @@ Maintainers List (try to look for most precise areas first)
 M:      Philip Blundell <philb@gnu.org>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/3c505*
+F:      drivers/net/ethernet/i825xx/3c505*
 3C59X NETWORK DRIVER
 M:      Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      Documentation/networking/vortex.txt
-F:      drivers/net/3c59x.c
+F:      drivers/net/ethernet/3com/3c59x.c
 3CR990 NETWORK DRIVER
 M:      David Dillow <dave@thedillows.org>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/typhoon*
+F:      drivers/net/ethernet/3com/typhoon*
 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
 M:      Adam Radford <linuxraid@lsi.com>
@@ -170,8 +170,7 @@ F:	include/linux/serial_8250.h
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 L:      netdev@vger.kernel.org
 S:      Orphan / Obsolete
-F:      drivers/net/*8390*
+F:      drivers/net/ethernet/8390/
-F:      drivers/net/ax88796.c
 9P FILE SYSTEM
 M:      Eric Van Hensbergen <ericvh@gmail.com>
@@ -214,7 +213,7 @@ ACENIC DRIVER
 M:      Jes Sorensen <jes@trained-monkey.org>
 L:      linux-acenic@sunsite.dk
 S:      Maintained
-F:      drivers/net/acenic*
+F:      drivers/net/ethernet/3com/acenic*
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:      Peter Feuerer <peter@piie.net>
@@ -746,7 +745,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/mach-ebsa110/
-F:      drivers/net/arm/am79c961a.*
+F:      drivers/net/ethernet/amd/am79c961a.*
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 M:      Daniel Ribeiro <drwyrm@gmail.com>
@@ -1015,7 +1014,7 @@ F:	arch/arm/include/asm/hardware/ioc.h
 F:      arch/arm/include/asm/hardware/iomd.h
 F:      arch/arm/include/asm/hardware/memc.h
 F:      arch/arm/mach-rpc/
-F:      drivers/net/arm/ether*
+F:      drivers/net/arm/ether3*
 F:      drivers/scsi/arm/
 ARM/SHARK MACHINE SUPPORT
@@ -1527,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER
 M:      Gary Zambrano <zambrano@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/b44.*
+F:      drivers/net/ethernet/broadcom/b44.*
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 M:      Michael Chan <mchan@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/bnx2.*
+F:      drivers/net/ethernet/broadcom/bnx2.*
-F:      drivers/net/bnx2_*
+F:      drivers/net/ethernet/broadcom/bnx2_*
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:      Eilon Greenstein <eilong@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/bnx2x/
+F:      drivers/net/ethernet/broadcom/bnx2x/
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
 M:      Michael Chan <mchan@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/tg3.*
+F:      drivers/net/ethernet/broadcom/tg3.*
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:      Brett Rudley <brudley@broadcom.com>
@@ -1995,7 +1994,7 @@ M:	Divy Le Ray <divy@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
-F:      drivers/net/cxgb3/
+F:      drivers/net/ethernet/chelsio/cxgb3/
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:      Steve Wise <swise@chelsio.com>
@@ -2009,7 +2008,7 @@ M:	Dimitris Michailidis <dm@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
-F:      drivers/net/cxgb4/
+F:      drivers/net/ethernet/chelsio/cxgb4/
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:      Steve Wise <swise@chelsio.com>
@@ -2023,7 +2022,7 @@ M:	Casey Leedom <leedom@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
-F:      drivers/net/cxgb4vf/
+F:      drivers/net/ethernet/chelsio/cxgb4vf/
 STMMAC ETHERNET DRIVER
 M:      Giuseppe Cavallaro <peppe.cavallaro@st.com>
@@ -2511,7 +2510,7 @@ ETHEREXPRESS-16 NETWORK DRIVER
 M:      Philip Blundell <philb@gnu.org>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/eexpress.*
+F:      drivers/net/ethernet/i825xx/eexpress.*
 ETHERNET BRIDGE
 M:      Stephen Hemminger <shemminger@linux-foundation.org>
@@ -3341,13 +3340,13 @@ M:	Bruce Allan <bruce.w.allan@intel.com>
 M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:      Don Skidmore <donald.c.skidmore@intel.com>
 M:      Greg Rose <gregory.v.rose@intel.com>
-M:      PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
+M:      Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:      Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 L:      e1000-devel@lists.sourceforge.net
 W:      http://e1000.sourceforge.net/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
 S:      Supported
 F:      Documentation/networking/e100.txt
 F:      Documentation/networking/e1000.txt
@@ -3357,14 +3356,7 @@ F:	Documentation/networking/igbvf.txt
 F:      Documentation/networking/ixgb.txt
 F:      Documentation/networking/ixgbe.txt
 F:      Documentation/networking/ixgbevf.txt
-F:      drivers/net/e100.c
+F:      drivers/net/ethernet/intel/
-F:      drivers/net/e1000/
-F:      drivers/net/e1000e/
-F:      drivers/net/igb/
-F:      drivers/net/igbvf/
-F:      drivers/net/ixgb/
-F:      drivers/net/ixgbe/
-F:      drivers/net/ixgbevf/
 INTEL MRST PMU DRIVER
 M:      Len Brown <len.brown@intel.com>
@@ -4507,7 +4499,7 @@ M:	Amit Kumar Salecha <amit.salecha@qlogic.com>
 L:      netdev@vger.kernel.org
 W:      http://www.qlogic.com
 S:      Supported
-F:      drivers/net/netxen/
+F:      drivers/net/ethernet/qlogic/netxen/
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:      Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -4941,7 +4933,7 @@ PCNET32 NETWORK DRIVER
 M:      Don Fry <pcnet32@frontier.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/pcnet32.c
+F:      drivers/net/ethernet/amd/pcnet32.c
 PCRYPT PARALLEL CRYPTO ENGINE
 M:      Steffen Klassert <steffen.klassert@secunet.com>
@@ -5253,7 +5245,7 @@ M:	linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      Documentation/networking/LICENSE.qla3xxx
-F:      drivers/net/qla3xxx.*
+F:      drivers/net/ethernet/qlogic/qla3xxx.*
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:      Amit Kumar Salecha <amit.salecha@qlogic.com>
@@ -5261,7 +5253,7 @@ M:	Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/qlcnic/
+F:      drivers/net/ethernet/qlogic/qlcnic/
 QLOGIC QLGE 10Gb ETHERNET DRIVER
 M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
@@ -5269,7 +5261,7 @@ M:	Ron Mercer <ron.mercer@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/qlge/
+F:      drivers/net/ethernet/qlogic/qlge/
 QNX4 FILESYSTEM
 M:      Anders Larsen <al@alarsen.net>
@@ -5877,7 +5869,7 @@ F:	mm/sl?b.c
 SMC91x ETHERNET DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
 S:      Odd Fixes
-F:      drivers/net/smc91x.*
+F:      drivers/net/ethernet/smsc/smc91x.*
 SMM665 HARDWARE MONITOR DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>
@@ -5912,13 +5904,13 @@ M:	Steve Glendinning <steve.glendinning@smsc.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      include/linux/smsc911x.h
-F:      drivers/net/smsc911x.*
+F:      drivers/net/ethernet/smsc/smsc911x.*
 SMSC9420 PCI ETHERNET DRIVER
 M:      Steve Glendinning <steve.glendinning@smsc.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/smsc9420.*
+F:      drivers/net/ethernet/smsc/smsc9420.*
 SN-IA64 (Itanium) SUB-PLATFORM
 M:      Jes Sorensen <jes@sgi.com>
@@ -6568,7 +6560,7 @@ W:	http://uclinux-h8.sourceforge.jp/
 S:      Supported
 F:      arch/h8300/
 F:      drivers/ide/ide-h8300.c
-F:      drivers/net/ne-h8300.c
+F:      drivers/net/ethernet/8390/ne-h8300.c
 UDF FILESYSTEM
 M:      Jan Kara <jack@suse.cz>
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
index 621619c794e5..2761364185af 100644
--- a/drivers/infiniband/hw/cxgb3/Makefile
+++ b/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb3
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
index cd20b1342aec..46b878ca2c3b 100644
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb4
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8d0314dbd946..d7d0b3532bc3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -193,6 +193,8 @@ source "drivers/net/phy/Kconfig"
 #       Ethernet
 #
+source "drivers/net/ethernet/Kconfig"
 menuconfig NET_ETHERNET
        bool "Ethernet (10 or 100Mbit)"
        depends on !UML
@@ -235,22 +237,6 @@ config MACB
 source "drivers/net/arm/Kconfig"
-config AX88796
-        tristate "ASIX AX88796 NE2000 clone support"
-        depends on ARM || MIPS || SUPERH
-        select PHYLIB
-        select MDIO_BITBANG
-        help
-          AX88796 driver, using platform bus to provide
-          chip detection and resources
-config AX88796_93CX6
-        bool "ASIX AX88796 external 93CX6 eeprom support"
-        depends on AX88796
-        select EEPROM_93CX6
-        help
-          Select this if your platform comes with an external 93CX6 eeprom.
 config MACE
        tristate "MACE (Power Mac ethernet) support"
        depends on PPC_PMAC && PPC32
@@ -285,71 +271,6 @@ config BMAC
          To compile this driver as a module, choose M here: the module
          will be called bmac.
-config ARIADNE
-        tristate "Ariadne support"
-        depends on ZORRO
-        help
-          If you have a Village Tronic Ariadne Ethernet adapter, say Y.
-          Otherwise, say N.
-          To compile this driver as a module, choose M here: the module
-          will be called ariadne.
-config A2065
-        tristate "A2065 support"
-        depends on ZORRO
-        select CRC32
-        help
-          If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
-          say N.
-          To compile this driver as a module, choose M here: the module
-          will be called a2065.
-config HYDRA
-        tristate "Hydra support"
-        depends on ZORRO
-        select CRC32
-        help
-          If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
-          To compile this driver as a module, choose M here: the module
-          will be called hydra.
-config ZORRO8390
-        tristate "Zorro NS8390-based Ethernet support"
-        depends on ZORRO
-        select CRC32
-        help
-          This driver is for Zorro Ethernet cards using an NS8390-compatible
-          chipset, like the Village Tronic Ariadne II and the Individual
-          Computers X-Surf Ethernet cards. If you have such a card, say Y.
-          Otherwise, say N.
-          To compile this driver as a module, choose M here: the module
-          will be called zorro8390.
-config APNE
-        tristate "PCMCIA NE2000 support"
-        depends on AMIGA_PCMCIA
-        select CRC32
-        help
-          If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
-          say N.
-          To compile this driver as a module, choose M here: the module
-          will be called apne.
-config MAC8390
-        bool "Macintosh NS 8390 based ethernet cards"
-        depends on MAC
-        select CRC32
-        help
-          If you want to include a driver to support Nubus or LC-PDS
-          Ethernet cards using an NS8390 chipset or its equivalent, say Y
-          and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
 config MAC89x0
        tristate "Macintosh CS89x0 based ethernet cards"
        depends on MAC
@@ -385,86 +306,6 @@ config MACMACE
          say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
-config MVME147_NET
-        tristate "MVME147 (Lance) Ethernet support"
-        depends on MVME147
-        select CRC32
-        help
-          Support for the on-board Ethernet interface on the Motorola MVME147
-          single-board computer.  Say Y here to include the
-          driver for this chip in your kernel.
-          To compile this driver as a module, choose M here.
-config MVME16x_NET
-        tristate "MVME16x Ethernet support"
-        depends on MVME16x
-        help
-          This is the driver for the Ethernet interface on the Motorola
-          MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
-          driver for this chip in your kernel.
-          To compile this driver as a module, choose M here.
-config BVME6000_NET
-        tristate "BVME6000 Ethernet support"
-        depends on BVME6000
-        help
-          This is the driver for the Ethernet interface on BVME4000 and
-          BVME6000 VME boards.  Say Y here to include the driver for this chip
-          in your kernel.
-          To compile this driver as a module, choose M here.
-config ATARILANCE
-        tristate "Atari Lance support"
-        depends on ATARI
-        help
-          Say Y to include support for several Atari Ethernet adapters based
-          on the AMD Lance chipset: RieblCard (with or without battery), or
-          PAMCard VME (also the version by Rhotron, with different addresses).
-config SUN3LANCE
-        tristate "Sun3/Sun3x on-board LANCE support"
-        depends on SUN3 || SUN3X
-        help
-          Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
-          featured an AMD Lance 10Mbit Ethernet controller on board; say Y
-          here to compile in the Linux driver for this and enable Ethernet.
-          General Linux information on the Sun 3 and 3x series (now
-          discontinued) is at
-          <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-          If you're not building a kernel for a Sun 3, say N.
-config SUN3_82586
-        bool "Sun3 on-board Intel 82586 support"
-        depends on SUN3
-        help
-          This driver enables support for the on-board Intel 82586 based
-          Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
-          that this driver does not support 82586-based adapters on additional
-          VME boards.
-config HPLANCE
-        bool "HP on-board LANCE support"
-        depends on DIO
-        select CRC32
-        help
-          If you want to use the builtin "LANCE" Ethernet controller on an
-          HP300 machine, say Y here.
-config LASI_82596
-        tristate "Lasi ethernet"
-        depends on GSC
-        help
-          Say Y here to support the builtin Intel 82596 ethernet controller
-          found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
-config SNI_82596
-        tristate "SNI RM ethernet"
-        depends on NET_ETHERNET && SNI_RM
-        help
-          Say Y here to support the on-board Intel 82596 ethernet controller
-          built into SNI RM machines.
 config KORINA
        tristate "Korina (IDT RC32434) Ethernet support"
        depends on NET_ETHERNET && MIKROTIK_RB532
@@ -485,15 +326,6 @@ config XTENSA_XT2000_SONIC
        help
          This is the driver for the onboard card of the Xtensa XT2000 board.
-config MIPS_AU1X00_ENET
-        tristate "MIPS AU1000 Ethernet support"
-        depends on MIPS_ALCHEMY
-        select PHYLIB
-        select CRC32
-        help
-          If you have an Alchemy Semi AU1X00 based system
-          say Y.  Otherwise, say N.
 config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
        depends on PCI && SGI_IP27
@@ -516,18 +348,6 @@ config SGI_O2MACE_ETH
        tristate "SGI O2 MACE Fast Ethernet support"
        depends on SGI_IP32=y
-config STNIC
-        tristate "National DP83902AV  support"
-        depends on SUPERH
-        select CRC32
-        help
-          Support for cards based on the National Semiconductor DP83902AV
-          ST-NIC Serial Network Interface Controller for Twisted Pair.  This
-          is a 10Mbit/sec Ethernet controller.  Product overview and specs at
-          <http://www.national.com/pf/DP/DP83902A.html>.
-          If unsure, say N.
 config SH_ETH
        tristate "Renesas SuperH Ethernet support"
        depends on SUPERH && \
@@ -543,19 +363,6 @@ config SH_ETH
          This driver supporting CPUs are:
                - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-config SUNLANCE
-        tristate "Sun LANCE support"
-        depends on SBUS
-        select CRC32
-        help
-          This driver supports the "le" interface present on all 32-bit Sparc
-          systems, on some older Ultra systems and as an Sbus option.  These
-          cards are based on the AMD Lance chipset, which is better known
-          via the NE2100 cards.
-          To compile this driver as a module, choose M here: the module
-          will be called sunlance.
 config HAPPYMEAL
        tristate "Sun Happy Meal 10/100baseT support"
        depends on SBUS || PCI
@@ -614,236 +421,6 @@ config SUNVNET
        help
          Support for virtual network devices under Sun Logical Domains.
-config NET_VENDOR_3COM
-        bool "3COM cards"
-        depends on ISA || EISA || MCA || PCI
-        help
-          If you have a network (Ethernet) card belonging to this class, say Y
-          and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          Note that the answer to this question doesn't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about 3COM cards. If you say Y, you will be asked for
-          your specific card in the following questions.
-config EL1
-        tristate "3c501 \"EtherLink\" support"
-        depends on NET_VENDOR_3COM && ISA
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
-          new card, since the 3c501 is slow, broken, and obsolete: you will
-          have problems.  Some people suggest to ping ("man ping") a nearby
-          machine every minute ("man cron") when using this card.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c501.
-config EL2
-        tristate "3c503 \"EtherLink II\" support"
-        depends on NET_VENDOR_3COM && ISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c503.
-config ELPLUS
-        tristate "3c505 \"EtherLink Plus\" support"
-        depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
-        ---help---
-          Information about this network (Ethernet) card can be found in
-          <file:Documentation/networking/3c505.txt>.  If you have a card of
-          this type, say Y and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c505.
-config EL16
-        tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
-        depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c507.
-config EL3
-        tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-        depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
-        ---help---
-          If you have a network (Ethernet) card belonging to the 3Com
-          EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-          from <http://www.tldp.org/docs.html#howto>.
-          If your card is not working you may need to use the DOS
-          setup disk to disable Plug & Play mode, and to select the default
-          media type.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c509.
-config 3C515
-        tristate "3c515 ISA \"Fast EtherLink\""
-        depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
-        help
-          If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
-          network card, say Y and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c515.
-config ELMC
-        tristate "3c523 \"EtherLink/MC\" support"
-        depends on NET_VENDOR_3COM && MCA_LEGACY
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c523.
-config ELMC_II
-        tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-        depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called 3c527.
-config VORTEX
-        tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
-        depends on NET_VENDOR_3COM && (PCI || EISA)
-        select MII
-        ---help---
-          This option enables driver support for a large number of 10Mbps and
-          10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
-          "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
-          "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
-          "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
-          "Tornado"   (3c905)                                  PCI
-          "Hurricane" (3c555/3cSOHO)                           PCI
-          If you have such a card, say Y and read the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>. More
-          specific information is in
-          <file:Documentation/networking/vortex.txt> and in the comments at
-          the beginning of <file:drivers/net/3c59x.c>.
-          To compile this support as a module, choose M here.
-config TYPHOON
-        tristate "3cr990 series \"Typhoon\" support"
-        depends on NET_VENDOR_3COM && PCI
-        select CRC32
-        ---help---
-          This option enables driver support for the 3cr990 series of cards:
-          3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
-          3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
-          3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called typhoon.
-config LANCE
-        tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-        depends on ISA && ISA_DMA_API
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
-          of this type.
-          To compile this driver as a module, choose M here: the module
-          will be called lance.  This is recommended.
-config NET_VENDOR_SMC
-        bool "Western Digital/SMC cards"
-        depends on ISA || MCA || EISA || MAC
-        help
-          If you have a network (Ethernet) card belonging to this class, say Y
-          and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          Note that the answer to this question doesn't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about Western Digital cards. If you say Y, you will be
-          asked for your specific card in the following questions.
-config WD80x3
-        tristate "WD80*3 support"
-        depends on NET_VENDOR_SMC && ISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called wd.
-config ULTRAMCA
-        tristate "SMC Ultra MCA support"
-        depends on NET_VENDOR_SMC && MCA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type and are running
-          an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called smc-mca.
-config ULTRA
-        tristate "SMC Ultra support"
-        depends on NET_VENDOR_SMC && ISA
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          Important: There have been many reports that, with some motherboards
-          mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
-          such as some BusLogic models) causes corruption problems with many
-          operating systems. The Linux smc-ultra driver has a work-around for
-          this but keep it in mind if you have such a SCSI card and have
-          problems.
-          To compile this driver as a module, choose M here. The module
-          will be called smc-ultra.
-config ULTRA32
-        tristate "SMC Ultra32 EISA support"
-        depends on NET_VENDOR_SMC && EISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called smc-ultra32.
 config BFIN_MAC
        tristate "Blackfin on-chip MAC support"
        depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -890,39 +467,6 @@ config BFIN_MAC_USE_HWSTAMP
        help
          To support the IEEE 1588 Precision Time Protocol (PTP), select y here
-config SMC9194
-        tristate "SMC 9194 support"
-        depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-        select CRC32
-        ---help---
-          This is support for the SMC9xxx based Ethernet cards. Choose this
-          option if you have a DELL laptop with the docking station, or
-          another SMC9192/9194 based chipset.  Say Y if you want it compiled
-          into the kernel, and read the file
-          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called smc9194.
-config SMC91X
-        tristate "SMC 91C9x/91C1xxx support"
-        select CRC32
-        select MII
-        depends on ARM || M32R || SUPERH || \
-                MIPS || BLACKFIN || MN10300 || COLDFIRE
-        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
-          compiled into the kernel, and read the file
-          <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
-          available from  <http://www.tldp.org/docs.html#howto>.
-          This driver is also available as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called smc91x.  If you want to compile it as a
-          module, say M here and read <file:Documentation/kbuild/modules.txt>.
 config PXA168_ETH
        tristate "Marvell pxa168 ethernet support"
        depends on CPU_PXA168
@@ -1037,50 +581,12 @@ config GRETH
        help
          Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-config SMC911X
-        tristate "SMSC LAN911[5678] support"
-        select CRC32
-        select MII
-        depends on ARM || SUPERH || MN10300
-        help
-          This is a driver for SMSC's LAN911x series of Ethernet chipsets
-          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
-          Say Y if you want it compiled into the kernel, 
-          and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          This driver is also available as a module. The module will be 
-          called smc911x.  If you want to compile it as a module, say M 
-          here and read <file:Documentation/kbuild/modules.txt>
-config SMSC911X
-        tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
-        depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300
-        select CRC32
-        select MII
-        select PHYLIB
-        ---help---
-          Say Y here if you want support for SMSC LAN911x and LAN921x families
-          of ethernet controllers.
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/networking/net-modules.txt>. The module
-          will be called smsc911x.
-config SMSC911X_ARCH_HOOKS
-        def_bool n
-        depends on SMSC911X
-        help
-          If the arch enables this, it allows the arch to implement various
-          hooks for more comprehensive interrupt control and also to override
-          the source of the MAC address.
 config NET_VENDOR_RACAL
        bool "Racal-Interlan (Micom) NI cards"
        depends on ISA
        help
          If you have a network (Ethernet) card belonging to this class, such
-          as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
+          as the NI5010, say Y and read the Ethernet-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.
          Note that the answer to this question doesn't directly affect the
@@ -1100,28 +606,6 @@ config NI5010
          To compile this driver as a module, choose M here. The module
          will be called ni5010.
-config NI52
-        tristate "NI5210 support"
-        depends on NET_VENDOR_RACAL && ISA
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called ni52.
-config NI65
-        tristate "NI6510 support"
-        depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          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
@@ -1147,19 +631,6 @@ config AT1700
          To compile this driver as a module, choose M here. The module
          will be called at1700.
-config DEPCA
-        tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-        depends on ISA || EISA || MCA
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto> as well as
-          <file:drivers/net/depca.c>.
-          To compile this driver as a module, choose M here. The module
-          will be called depca.
 config HP100
        tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
        depends on ISA || EISA || PCI
@@ -1188,18 +659,6 @@ config NET_ISA
          the remaining ISA network card questions. If you say Y, you will be
          asked for your specific card in the following questions.
-config E2100
-        tristate "Cabletron E21xx support"
-        depends on NET_ISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called e2100.
 config EWRK3
        tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
        depends on NET_ISA
@@ -1214,65 +673,6 @@ config EWRK3
          To compile this driver as a module, choose M here. The module
          will be called ewrk3.
-config EEXPRESS
-        tristate "EtherExpress 16 support"
-        depends on NET_ISA
-        ---help---
-          If you have an EtherExpress16 network (Ethernet) card, say Y and
-          read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.  Note that the Intel
-          EtherExpress16 card used to be regarded as a very poor choice
-          because the driver was very unreliable. We now have a new driver
-          that should do better.
-          To compile this driver as a module, choose M here. The module
-          will be called eexpress.
-config EEXPRESS_PRO
-        tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
-        depends on NET_ISA
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y. This
-          driver supports Intel i82595{FX,TX} based boards. Note however
-          that the EtherExpress PRO/100 Ethernet card has its own separate
-          driver.  Please read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called eepro.
-config HPLAN_PLUS
-        tristate "HP PCLAN+ (27247B and 27252A) support"
-        depends on NET_ISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called hp-plus.
-config HPLAN
-        tristate "HP PCLAN (27245 and other 27xxx series) support"
-        depends on NET_ISA
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called hp.
-config LP486E
-        tristate "LP486E on board Ethernet"
-        depends on NET_ISA
-        help
-          Say Y here to support the 82596-based on-board Ethernet controller
-          for the Panther motherboard, which is one of the two shipped in the
-          Intel Professional Workstation.
 config ETH16I
        tristate "ICL EtherTeam 16i/32 support"
        depends on NET_ISA
@@ -1284,36 +684,6 @@ config ETH16I
          To compile this driver as a module, choose M here. The module
          will be called eth16i.
-config NE2000
-        tristate "NE2000/NE1000 support"
-        depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.  Many Ethernet cards
-          without a specific driver are compatible with NE2000.
-          If you have a PCI NE2000 card however, say N here and Y to "PCI
-          NE2000 and clone support" under "EISA, VLB, PCI and on board
-          controllers" below. If you have a NE2000 card and are running on
-          an MCA system (a bus system used on some IBM PS/2 computers and
-          laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
-          below.
-          To compile this driver as a module, choose M here. The module
-          will be called ne.
-config ZNET
-        tristate "Zenith Z-Note support (EXPERIMENTAL)"
-        depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
-        help
-          The Zenith Z-Note notebook computer has a built-in network
-          (Ethernet) card, and this is the Linux driver for it. Note that the
-          IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-          by this driver. Read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
 config SEEQ8005
        tristate "SEEQ8005 support (EXPERIMENTAL)"
        depends on NET_ISA && EXPERIMENTAL
@@ -1325,18 +695,6 @@ config SEEQ8005
          To compile this driver as a module, choose M here. The module
          will be called seeq8005.
-config NE2_MCA
-        tristate "NE/2 (ne2000 MCA version) support"
-        depends on MCA_LEGACY
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called ne2.
 config IBMLANA
        tristate "IBM LAN Adapter/A support"
        depends on MCA
@@ -1378,32 +736,6 @@ config NET_PCI
          will be asked for your specific card in the following questions. If
          you are unsure, say Y.
-config PCNET32
-        tristate "AMD PCnet32 PCI support"
-        depends on NET_PCI && PCI
-        select CRC32
-        select MII
-        help
-          If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
-          answer Y here and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called pcnet32.
-config AMD8111_ETH
-        tristate "AMD 8111 (new PCI lance) support"
-        depends on NET_PCI && PCI
-        select CRC32
-        select MII
-        help
-          If you have an AMD 8111-based PCI lance ethernet card,
-          answer Y here and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called amd8111e.
 config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI
@@ -1418,18 +750,6 @@ config ADAPTEC_STARFIRE
          To compile this driver as a module, choose M here: the module
          will be called starfire.  This is recommended.
-config AC3200
-        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
-        depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called ac3200.
 config KSZ884X_PCI
        tristate "Micrel KSZ8841/2 PCI"
        depends on NET_PCI && PCI
@@ -1441,49 +761,6 @@ config KSZ884X_PCI
          To compile this driver as a module, choose M here. The module
          will be called ksz884x.
-config APRICOT
-        tristate "Apricot Xen-II on board Ethernet"
-        depends on NET_PCI && ISA
-        help
-          If you have a network (Ethernet) controller of this type, say Y and
-          read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called apricot.
-config B44
-        tristate "Broadcom 440x/47xx ethernet support"
-        depends on SSB_POSSIBLE && HAS_DMA
-        select SSB
-        select MII
-        help
-          If you have a network (Ethernet) controller of this type, say Y
-          or M and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called b44.
-# Auto-select SSB PCI-HOST support, if possible
-config B44_PCI_AUTOSELECT
-        bool
-        depends on B44 && SSB_PCIHOST_POSSIBLE
-        select SSB_PCIHOST
-        default y
-# Auto-select SSB PCICORE driver, if possible
-config B44_PCICORE_AUTOSELECT
-        bool
-        depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
-        select SSB_DRIVER_PCICORE
-        default y
-config B44_PCI
-        bool
-        depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
-        default y
 config FORCEDETH
        tristate "nForce Ethernet support"
        depends on NET_PCI && PCI
@@ -1519,44 +796,6 @@ config TC35815
        depends on NET_PCI && PCI && MIPS
        select PHYLIB
-config E100
-        tristate "Intel(R) PRO/100+ support"
-        depends on NET_PCI && PCI
-        select MII
-        ---help---
-          This driver supports Intel(R) PRO/100 family of adapters.
-          To verify that your adapter is supported, find the board ID number 
-          on the adapter. Look for a label that has a barcode and a number 
-          in the format 123456-001 (six digits hyphen three digits). 
-          Use the above information and the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          to identify the adapter.
-          For the latest Intel PRO/100 network driver for Linux, see:
-          <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
-          More specific information on configuring the driver is in 
-          <file:Documentation/networking/e100.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called e100.
-config LNE390
-        tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
-        depends on NET_PCI && EISA && EXPERIMENTAL
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called lne390.
 config FEALNX
        tristate "Myson MTD-8xx PCI Ethernet support"
        depends on NET_PCI && PCI
@@ -1577,50 +816,6 @@ config NATSEMI
          More specific information and updates are available from
          <http://www.scyld.com/network/natsemi.html>.
-config NE2K_PCI
-        tristate "PCI NE2000 and clones support (see help)"
-        depends on NET_PCI && PCI
-        select CRC32
-        ---help---
-          This driver is for NE2000 compatible PCI cards. It will not work
-          with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
-          support" below). If you have a PCI NE2000 network (Ethernet) card,
-          say Y and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          This driver also works for the following NE2000 clone cards:
-          RealTek RTL-8029  Winbond 89C940  Compex RL2000  KTI ET32P2
-          NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
-          Holtek HT80232    Holtek HT80229
-          To compile this driver as a module, choose M here. The module
-          will be called ne2k-pci.
-config NE3210
-        tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
-        depends on NET_PCI && EISA && EXPERIMENTAL
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.  Note that this driver
-          will NOT WORK for NE3200 cards as they are completely different.
-          To compile this driver as a module, choose M here. The module
-          will be called ne3210.
-config ES3210
-        tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
-        depends on NET_PCI && EISA && EXPERIMENTAL
-        select CRC32
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. The module
-          will be called es3210.
 config 8139CP
        tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
        depends on NET_PCI && PCI && EXPERIMENTAL
@@ -1717,33 +912,6 @@ config SIS900
          To compile this driver as a module, choose M here: the module
          will be called sis900.  This is recommended.
-config EPIC100
-        tristate "SMC EtherPower II"
-        depends on NET_PCI && PCI
-        select CRC32
-        select MII
-        help
-          This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
-          which is based on the SMC83c17x (EPIC/100).
-          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.tldp.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
@@ -1925,15 +1093,6 @@ config SGISEEQ
          Say Y here if you have an Seeq based Ethernet network card. This is
          used in many Silicon Graphics machines.
-config DECLANCE
-        tristate "DEC LANCE ethernet controller support"
-        depends on MACH_DECSTATION
-        select CRC32
-        help
-          This driver is for the series of Ethernet controllers produced by
-          DEC (now Compaq) based on the AMD Lance chipset, including the
-          DEPCA series.  (This chipset is better known via the NE2100 cards.)
 config FEC
        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
        depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
@@ -1967,13 +1126,6 @@ config FEC_MPC52xx_MDIO
          If not sure, enable.
          If compiled as module, it will be called fec_mpc52xx_phy.
-config NE_H8300
-        tristate "NE2000 compatible support for H8/300"
-        depends on H8300
-        help
-          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
@@ -1992,15 +1144,6 @@ config XILINX_EMACLITE
        help
          This driver supports the 10/100 Ethernet Lite from Xilinx.
-config BCM63XX_ENET
-        tristate "Broadcom 63xx internal mac support"
-        depends on BCM63XX
-        select MII
-        select PHYLIB
-        help
-          This driver supports the ethernet MACs in the Broadcom 63xx
-          MIPS chipset family (BCM63XX).
 config FTMAC100
        tristate "Faraday FTMAC100 10/100 Ethernet support"
        depends on ARM
@@ -2044,33 +1187,6 @@ menuconfig NETDEV_1000
 if NETDEV_1000
-config ACENIC
-        tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
-        depends on PCI
-        ---help---
-          Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
-          GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
-          adapter. The driver allows for using the Jumbo Frame option (9000
-          bytes/frame) however it requires that your switches can handle this
-          as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
-          line.
-          To compile this driver as a module, choose M here: the
-          module will be called acenic.
-config ACENIC_OMIT_TIGON_I
-        bool "Omit support for old Tigon I based AceNICs"
-        depends on ACENIC
-        help
-          Say Y here if you only have Tigon II based AceNICs and want to leave
-          out support for the older Tigon I based cards which are no longer
-          being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
-          version)).  This will reduce the size of the driver object by
-          app. 100KB.  If you are not sure whether your card is a Tigon I or a
-          Tigon II, say N here.
-          The safe and default value for this is N.
 config DL2K
        tristate "DL2000/TC902x-based Gigabit Ethernet support"
        depends on PCI
@@ -2085,47 +1201,6 @@ config DL2K
          To compile this driver as a module, choose M here: the
          module will be called dl2k.
-config E1000
-        tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
-        depends on PCI
-        ---help---
-          This driver supports Intel(R) PRO/1000 gigabit ethernet family of
-          adapters.  For more information on how to identify your adapter, go 
-          to the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          More specific information on configuring the driver is in 
-          <file:Documentation/networking/e1000.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called e1000.
-config E1000E
-        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-        depends on PCI && (!SPARC32 || BROKEN)
-        select CRC32
-        ---help---
-          This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
-          ethernet family of adapters. For PCI or PCI-X e1000 adapters,
-          use the regular e1000 driver For more information on how to
-          identify your adapter, go to the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          To compile this driver as a module, choose M here. The module
-          will be called e1000e.
 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
@@ -2136,57 +1211,6 @@ config IP1000
          To compile this driver as a module, choose M here: the module
          will be called ipg.  This is recommended.
-config IGB
-        tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
-        depends on PCI
-        ---help---
-          This driver supports Intel(R) 82575/82576 gigabit ethernet family of
-          adapters.  For more information on how to identify your adapter, go
-          to the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/e1000.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called igb.
-config IGB_DCA
-        bool "Direct Cache Access (DCA) Support"
-        default y
-        depends on IGB && DCA && !(IGB=y && DCA=m)
-        ---help---
-          Say Y here if you want to use Direct Cache Access (DCA) in the
-          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 IGBVF
-        tristate "Intel(R) 82576 Virtual Function Ethernet support"
-        depends on PCI
-        ---help---
-          This driver supports Intel(R) 82576 virtual functions.  For more
-          information on how to identify your adapter, go to the Adapter &
-          Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/e1000.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called igbvf.
 source "drivers/net/ixp2000/Kconfig"
 config NS83820
@@ -2237,19 +1261,6 @@ config R8169
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
-config SB1250_MAC
-        tristate "SB1250 Gigabit Ethernet support"
-        depends on SIBYTE_SB1xxx_SOC
-        select PHYLIB
-        ---help---
-          This driver supports Gigabit Ethernet interfaces based on the
-          Broadcom SiByte family of System-On-a-Chip parts.  They include
-          the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
-          and BCM1480 chips.
-          To compile this driver as a module, choose M here: the module
-          will be called sb1250-mac.
 config SIS190
        tristate "SiS190/SiS191 gigabit ethernet support"
        depends on PCI
@@ -2343,39 +1354,6 @@ config VIA_VELOCITY
          To compile this driver as a module, choose M here. The module
          will be called via-velocity.
-config TIGON3
-        tristate "Broadcom Tigon3 support"
-        depends on PCI
-        select PHYLIB
-        help
-          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called tg3.  This is recommended.
-config BNX2
-        tristate "Broadcom NetXtremeII support"
-        depends on PCI
-        select CRC32
-        select FW_LOADER
-        help
-          This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called bnx2.  This is recommended.
-config CNIC
-        tristate "Broadcom CNIC support"
-        depends on PCI
-        select BNX2
-        select UIO
-        help
-          This driver supports offload features of Broadcom NetXtremeII
-          gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called cnic.  This is recommended.
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
@@ -2466,15 +1444,6 @@ config XILINX_LL_TEMAC
          This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
          core used in Xilinx Spartan and Virtex FPGAs
-config QLA3XXX
-        tristate "QLogic QLA3XXX Network Driver Support"
-        depends on PCI
-        help
-          This driver supports QLogic ISP3XXX gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called qla3xxx.
 config ATL1
        tristate "Atheros/Attansic L1 Gigabit Ethernet support"
        depends on PCI
@@ -2583,92 +1552,6 @@ if NETDEV_10000
 config MDIO
        tristate
-config CHELSIO_T1
-        tristate "Chelsio 10Gb Ethernet support"
-        depends on PCI
-        select CRC32
-        select MDIO
-        help
-          This driver supports Chelsio gigabit and 10-gigabit
-          Ethernet cards. More information about adapter features and
-          performance tuning is in <file:Documentation/networking/cxgb.txt>.
-          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.html>.
-          Please send feedback to <linux-bugs@chelsio.com>.
-          To compile this driver as a module, choose M here: the module
-          will be called cxgb.
-config CHELSIO_T1_1G
-        bool "Chelsio gigabit Ethernet support"
-        depends on CHELSIO_T1
-        help
-          Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
-          are using only 10G cards say 'N' here.
-config CHELSIO_T3
-        tristate "Chelsio Communications T3 10Gb Ethernet support"
-        depends on PCI && INET
-        select FW_LOADER
-        select MDIO
-        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.html>.
-          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 CHELSIO_T4
-        tristate "Chelsio Communications T4 Ethernet support"
-        depends on PCI
-        select FW_LOADER
-        select MDIO
-        help
-          This driver supports Chelsio T4-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.html>.
-          Please send feedback to <linux-bugs@chelsio.com>.
-          To compile this driver as a module choose M here; the module
-          will be called cxgb4.
-config CHELSIO_T4VF
-        tristate "Chelsio Communications T4 Virtual Function Ethernet support"
-        depends on PCI
-        help
-          This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-          adapters with PCI-E SR-IOV Virtual Functions.
-          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.html>.
-          Please send feedback to <linux-bugs@chelsio.com>.
-          To compile this driver as a module choose M here; the module
-          will be called cxgb4vf.
 config EHEA
        tristate "eHEA Ethernet support"
        depends on IBMEBUS && INET && SPARSEMEM
@@ -2685,88 +1568,6 @@ config ENIC
        help
          This enables the support for the Cisco VIC Ethernet card.
-config IXGBE
-        tristate "Intel(R) 10GbE PCI Express adapters support"
-        depends on PCI && INET
-        select MDIO
-        ---help---
-          This driver supports Intel(R) 10GbE PCI Express family of
-          adapters.  For more information on how to identify your adapter, go
-          to the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          To compile this driver as a module, choose M here. The module
-          will be called ixgbe.
-config IXGBE_DCA
-        bool "Direct Cache Access (DCA) Support"
-        default y
-        depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
-        ---help---
-          Say Y here if you want to use Direct Cache Access (DCA) in the
-          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 IXGBEVF
-        tristate "Intel(R) 82599 Virtual Function Ethernet support"
-        depends on PCI_MSI
-        ---help---
-          This driver supports Intel(R) 82599 virtual functions.  For more
-          information on how to identify your adapter, go to the Adapter &
-          Driver ID Guide at:
-          <http://support.intel.com/support/network/sb/CS-008441.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/ixgbevf.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called ixgbevf.  MSI-X interrupt support is required
-          for this driver to work correctly.
-config IXGB
-        tristate "Intel(R) PRO/10GbE support"
-        depends on PCI
-        ---help---
-          This driver supports Intel(R) PRO/10GbE family of adapters for
-          PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
-          instead. For more information on how to identify your adapter, go
-          to the Adapter & Driver ID Guide at:
-          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-          For general information and support, go to the Intel support
-          website at:
-          <http://support.intel.com>
-          More specific information on configuring the driver is in 
-          <file:Documentation/networking/ixgb.txt>.
-          To compile this driver as a module, choose M here. The module
-          will be called ixgb.
 config S2IO
        tristate "Exar Xframe 10Gb Ethernet Adapter"
        depends on PCI
@@ -2827,13 +1628,6 @@ config MYRI10GE_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 NETXEN_NIC
-        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
-        depends on PCI
-        select FW_LOADER
-        help
-          This enables the support for NetXen's Gigabit Ethernet card.
 config NIU
        tristate "Sun Neptune 10Gbit Ethernet support"
        depends on PCI
@@ -2881,35 +1675,6 @@ config TEHUTI
        help
          Tehuti Networks 10G Ethernet NIC
-config BNX2X
-        tristate "Broadcom NetXtremeII 10Gb support"
-        depends on PCI
-        select FW_LOADER
-        select ZLIB_INFLATE
-        select LIBCRC32C
-        select MDIO
-        help
-          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called bnx2x.  This is recommended.
-config QLCNIC
-        tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
-        depends on PCI
-        select FW_LOADER
-        help
-          This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
-          devices.
-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.
 config BNA
        tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
        depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e1eca2ab505e..49b3e87075d3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the Linux network (ethercard) device drivers.
+# Makefile for the Linux network device drivers.
 #
 obj-$(CONFIG_MII) += mii.o
@@ -10,19 +10,8 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_CHELSIO_T1) += chelsio/
-obj-$(CONFIG_CHELSIO_T3) += cxgb3/
-obj-$(CONFIG_CHELSIO_T4) += cxgb4/
-obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
@@ -56,7 +45,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 obj-$(CONFIG_HAPPYMEAL) += sunhme.o
-obj-$(CONFIG_SUNLANCE) += sunlance.o
 obj-$(CONFIG_SUNQE) += sunqe.o
 obj-$(CONFIG_SUNBMAC) += sunbmac.o
 obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
@@ -66,28 +54,15 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_VORTEX) += 3c59x.o
-obj-$(CONFIG_TYPHOON) += typhoon.o
-obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
-obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_EPIC100) += epic100.o
-obj-$(CONFIG_SMSC9420) += smsc9420.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
-obj-$(CONFIG_ACENIC) += acenic.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
-obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
-obj-$(CONFIG_TIGON3) += tg3.o
-obj-$(CONFIG_BNX2) += bnx2.o
-obj-$(CONFIG_CNIC) += cnic.o
-obj-$(CONFIG_BNX2X) += bnx2x/
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -117,35 +92,13 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_MAC8390) += mac8390.o
-obj-$(CONFIG_APNE) += apne.o 8390.o
-obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
 ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
        obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
 endif
-obj-$(CONFIG_WD80x3) += wd.o 8390.o
-obj-$(CONFIG_EL2) += 3c503.o 8390p.o
-obj-$(CONFIG_NE2000) += ne.o 8390p.o
-obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
-obj-$(CONFIG_HPLAN) += hp.o 8390p.o
-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
-obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
-obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
-obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
-obj-$(CONFIG_E2100) += e2100.o 8390.o
-obj-$(CONFIG_ES3210) += es3210.o 8390.o
-obj-$(CONFIG_LNE390) += lne390.o 8390.o
-obj-$(CONFIG_NE3210) += ne3210.o 8390.o
-obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
-obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_NE_H8300) += ne-h8300.o
-obj-$(CONFIG_AX88796) += ax88796.o
-obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
 obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 obj-$(CONFIG_FTMAC100) += ftmac100.o
@@ -154,9 +107,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-obj-$(CONFIG_QLA3XXX) += qla3xxx.o
-obj-$(CONFIG_QLCNIC) += qlcnic/
-obj-$(CONFIG_QLGE) += qlge/
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
@@ -180,59 +130,25 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_LANCE) += lance.o
-obj-$(CONFIG_SUN3_82586) += sun3_82586.o
-obj-$(CONFIG_SUN3LANCE) += sun3lance.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_EL1) += 3c501.o
-obj-$(CONFIG_EL16) += 3c507.o
-obj-$(CONFIG_ELMC) += 3c523.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
-obj-$(CONFIG_ELMC_II) += 3c527.o
-obj-$(CONFIG_EL3) += 3c509.o
-obj-$(CONFIG_3C515) += 3c515.o
-obj-$(CONFIG_EEXPRESS) += eexpress.o
-obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
-obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_CPMAC) += cpmac.o
-obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_NI52) += ni52.o
-obj-$(CONFIG_NI65) += ni65.o
-obj-$(CONFIG_ELPLUS) += 3c505.o
-obj-$(CONFIG_AC3200) += ac3200.o 8390.o
-obj-$(CONFIG_APRICOT) += 82596.o
-obj-$(CONFIG_LASI_82596) += lasi_82596.o
-obj-$(CONFIG_SNI_82596) += sni_82596.o
-obj-$(CONFIG_MVME16x_NET) += 82596.o
-obj-$(CONFIG_BVME6000_NET) += 82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
-# This is also a 82596 and should probably be merged
-obj-$(CONFIG_LP486E) += lp486e.o
 obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o
-obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
-obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
-obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_DECLANCE) += declance.o
-obj-$(CONFIG_ATARILANCE) += atarilance.o
-obj-$(CONFIG_A2065) += a2065.o
-obj-$(CONFIG_HYDRA) += hydra.o
-obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_MACMACE) += macmace.o
@@ -242,14 +158,10 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_VXGE) += vxge/
 obj-$(CONFIG_MYRI10GE) += myri10ge/
-obj-$(CONFIG_SMC91X) += smc91x.o
-obj-$(CONFIG_SMC911X) += smc911x.o
-obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
@@ -269,6 +181,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
+obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
@@ -295,7 +208,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 obj-$(CONFIG_FS_ENET) += fs_enet/
-obj-$(CONFIG_NETXEN_NIC) += netxen/
 obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 39e1c0d39476..7848b5f67013 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -2,20 +2,6 @@
 # Acorn Network device configuration
 #  These are for Acorn's Expansion card network interfaces
 #
-config ARM_AM79C961A
-        bool "ARM EBSA110 AM79C961A support"
-        depends on ARM && ARCH_EBSA110
-        select CRC32
-        help
-          If you wish to compile a kernel for the EBSA-110, then you should
-          always answer Y to this.
-config ARM_ETHER1
-        tristate "Acorn Ether1 support"
-        depends on ARM && ARCH_ACORN
-        help
-          If you have an Acorn system with one of these (AKA25) network cards,
-          you should say Y to this option if you wish to use it with Linux.
 config ARM_ETHER3
        tristate "Acorn/ANT Ether3 support"
@@ -24,14 +10,6 @@ config ARM_ETHER3
          If you have an Acorn system with one of these network cards, you
          should say Y to this option if you wish to use it with Linux.
-config ARM_ETHERH
-        tristate "I-cubed EtherH/ANT EtherM support"
-        depends on ARM && ARCH_ACORN
-        select CRC32
-        help
-          If you have an Acorn system with one of these network cards, you
-          should say Y to this option if you wish to use it with Linux.
 config ARM_AT91_ETHER
        tristate "AT91RM9200 Ethernet support"
        depends on ARM && ARCH_AT91RM9200
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 303171f589e6..6cca728b8094 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -3,10 +3,7 @@
 # Makefile for the ARM network device drivers
 #
-obj-$(CONFIG_ARM_AM79C961A)     += am79c961a.o
-obj-$(CONFIG_ARM_ETHERH)        += etherh.o
 obj-$(CONFIG_ARM_ETHER3)        += ether3.o
-obj-$(CONFIG_ARM_ETHER1)        += ether1.o
 obj-$(CONFIG_ARM_AT91_ETHER)    += at91_ether.o
 obj-$(CONFIG_ARM_KS8695_ETHER)  += ks8695net.o
 obj-$(CONFIG_EP93XX_ETH)        += ep93xx_eth.o
diff --git a/drivers/net/3c501.c b/drivers/net/ethernet/3com/3c501.c
index 5420f6de27df..5420f6de27df 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/ethernet/3com/3c501.c
diff --git a/drivers/net/3c501.h b/drivers/net/ethernet/3com/3c501.h
index 183fd55f03cb..183fd55f03cb 100644
--- a/drivers/net/3c501.h
+++ b/drivers/net/ethernet/3com/3c501.h
diff --git a/drivers/net/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 44b28b2d7003..44b28b2d7003 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
diff --git a/drivers/net/3c515.c b/drivers/net/ethernet/3com/3c515.c
index d2bb4b254c57..d2bb4b254c57 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 34c5e1cbf65d..34c5e1cbf65d 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 4a1a35809807..4a1a35809807 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
diff --git a/drivers/net/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 8cc22568ebd3..8cc22568ebd3 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
new file mode 100644
index 000000000000..497f038dcd47
--- /dev/null
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -0,0 +1,147 @@
+#
+# 3Com Ethernet device configuration
+#
+config NET_VENDOR_3COM
+        bool "3Com devices"
+        depends on ISA || EISA || MCA || PCI || PCMCIA
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about 3Com cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_3COM
+config EL1
+        tristate "3c501 \"EtherLink\" support"
+        depends on ISA
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
+          new card, since the 3c501 is slow, broken, and obsolete: you will
+          have problems.  Some people suggest to ping ("man ping") a nearby
+          machine every minute ("man cron") when using this card.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c501.
+config EL3
+        tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
+        depends on (ISA || EISA || MCA)
+        ---help---
+          If you have a network (Ethernet) card belonging to the 3Com
+          EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
+          from <http://www.tldp.org/docs.html#howto>.
+          If your card is not working you may need to use the DOS
+          setup disk to disable Plug & Play mode, and to select the default
+          media type.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c509.
+config 3C515
+        tristate "3c515 ISA \"Fast EtherLink\""
+        depends on (ISA || EISA) && ISA_DMA_API
+        ---help---
+          If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
+          network card, say Y and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c515.
+config PCMCIA_3C574
+        tristate "3Com 3c574 PCMCIA support"
+        depends on PCMCIA
+        ---help---
+          Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
+          (PC-card) Fast Ethernet card to your computer.
+          To compile this driver as a module, choose M here: the module will be
+          called 3c574_cs.  If unsure, say N.
+config PCMCIA_3C589
+        tristate "3Com 3c589 PCMCIA support"
+        depends on PCMCIA
+        ---help---
+          Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
+          (PC-card) Ethernet card to your computer.
+          To compile this driver as a module, choose M here: the module will be
+          called 3c589_cs.  If unsure, say N.
+config VORTEX
+        tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
+        depends on (PCI || EISA)
+        select MII
+        ---help---
+          This option enables driver support for a large number of 10Mbps and
+          10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
+          "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
+          "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
+          "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
+          "Tornado"   (3c905)                                  PCI
+          "Hurricane" (3c555/3cSOHO)                           PCI
+          If you have such a card, say Y and read the Ethernet-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>. More
+          specific information is in
+          <file:Documentation/networking/vortex.txt> and in the comments at
+          the beginning of <file:drivers/net/3c59x.c>.
+          To compile this support as a module, choose M here.
+config TYPHOON
+        tristate "3cr990 series \"Typhoon\" support"
+        depends on PCI
+        select CRC32
+        ---help---
+          This option enables driver support for the 3cr990 series of cards:
+          3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
+          3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
+          3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called typhoon.
+config ACENIC
+        tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
+        depends on PCI
+        ---help---
+          Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
+          GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
+          adapter. The driver allows for using the Jumbo Frame option (9000
+          bytes/frame) however it requires that your switches can handle this
+          as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
+          line.
+          To compile this driver as a module, choose M here: the
+          module will be called acenic.
+config ACENIC_OMIT_TIGON_I
+        bool "Omit support for old Tigon I based AceNICs"
+        depends on ACENIC
+        ---help---
+          Say Y here if you only have Tigon II based AceNICs and want to leave
+          out support for the older Tigon I based cards which are no longer
+          being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
+          version)).  This will reduce the size of the driver object by
+          app. 100KB.  If you are not sure whether your card is a Tigon I or a
+          Tigon II, say N here.
+          The safe and default value for this is N.
+endif # NET_VENDOR_3COM
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
new file mode 100644
index 000000000000..96d1d60d67b6
--- /dev/null
+++ b/drivers/net/ethernet/3com/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the 3Com Ethernet device drivers
+#
+obj-$(CONFIG_EL1) += 3c501.o
+obj-$(CONFIG_EL3) += 3c509.o
+obj-$(CONFIG_3C515) += 3c515.o
+obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
+obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
+obj-$(CONFIG_VORTEX) += 3c59x.o
+obj-$(CONFIG_ACENIC) += acenic.o
+obj-$(CONFIG_TYPHOON) += typhoon.o
diff --git a/drivers/net/acenic.c b/drivers/net/ethernet/3com/acenic.c
index 31798f5f5d06..31798f5f5d06 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/ethernet/3com/acenic.c
diff --git a/drivers/net/acenic.h b/drivers/net/ethernet/3com/acenic.h
index 51c486cfbb8c..51c486cfbb8c 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/ethernet/3com/acenic.h
diff --git a/drivers/net/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 1d5091a1e49a..1d5091a1e49a 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
diff --git a/drivers/net/typhoon.h b/drivers/net/ethernet/3com/typhoon.h
index 88187fc84aa3..88187fc84aa3 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/ethernet/3com/typhoon.h
diff --git a/drivers/net/3c503.c b/drivers/net/ethernet/8390/3c503.c
index 84e68f1b9adf..84e68f1b9adf 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/ethernet/8390/3c503.c
diff --git a/drivers/net/3c503.h b/drivers/net/ethernet/8390/3c503.h
index e2367b82a2ec..e2367b82a2ec 100644
--- a/drivers/net/3c503.h
+++ b/drivers/net/ethernet/8390/3c503.h
diff --git a/drivers/net/8390.c b/drivers/net/ethernet/8390/8390.c
index 7c7518be1756..7c7518be1756 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/ethernet/8390/8390.c
diff --git a/drivers/net/8390.h b/drivers/net/ethernet/8390/8390.h
index 58a12e4c78f9..58a12e4c78f9 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/ethernet/8390/8390.h
diff --git a/drivers/net/8390p.c b/drivers/net/ethernet/8390/8390p.c
index a2a64ea0b691..a2a64ea0b691 100644
--- a/drivers/net/8390p.c
+++ b/drivers/net/ethernet/8390/8390p.c
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
new file mode 100644
index 000000000000..f1b9bddc1550
--- /dev/null
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -0,0 +1,335 @@
+#
+# 8390 device configuration
+#
+config NET_VENDOR_8390
+        bool "National Semi-conductor 8390 devices"
+        depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA || EISA ||  \
+                   MAC || M32R || MACH_TX49XX || MCA_LEGACY || H8300 ||  \
+                   ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Western Digital cards. If you say Y, you will be
+          asked for your specific card in the following questions.
+if NET_VENDOR_8390
+config EL2
+        tristate "3c503 \"EtherLink II\" support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c503.
+config AC3200
+        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
+        depends on PCI && (ISA || EISA) && EXPERIMENTAL
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called ac3200.
+config PCMCIA_AXNET
+        tristate "Asix AX88190 PCMCIA support"
+        depends on PCMCIA
+        ---help---
+          Say Y here if you intend to attach an Asix AX88190-based PCMCIA
+          (PC-card) Fast Ethernet card to your computer.  These cards are
+          nearly NE2000 compatible but need a separate driver due to a few
+          misfeatures.
+          To compile this driver as a module, choose M here: the module will be
+          called axnet_cs.  If unsure, say N.
+config AX88796
+        tristate "ASIX AX88796 NE2000 clone support"
+        depends on (ARM || MIPS || SUPERH)
+        select PHYLIB
+        select MDIO_BITBANG
+        ---help---
+          AX88796 driver, using platform bus to provide
+          chip detection and resources
+config AX88796_93CX6
+        bool "ASIX AX88796 external 93CX6 eeprom support"
+        depends on AX88796
+        select EEPROM_93CX6
+        ---help---
+          Select this if your platform comes with an external 93CX6 eeprom.
+config E2100
+        tristate "Cabletron E21xx support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called e2100.
+config ES3210
+        tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
+        depends on PCI && EISA && EXPERIMENTAL
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called es3210.
+config HPLAN_PLUS
+        tristate "HP PCLAN+ (27247B and 27252A) support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called hp-plus.
+config HPLAN
+        tristate "HP PCLAN (27245 and other 27xxx series) support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called hp.
+config HYDRA
+        tristate "Hydra support"
+        depends on ZORRO
+        select CRC32
+        ---help---
+          If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
+          To compile this driver as a module, choose M here: the module
+          will be called hydra.
+config ARM_ETHERH
+        tristate "I-cubed EtherH/ANT EtherM support"
+        depends on ARM && ARCH_ACORN
+        select CRC32
+        ---help---
+          If you have an Acorn system with one of these network cards, you
+          should say Y to this option if you wish to use it with Linux.
+config LNE390
+        tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
+        depends on PCI && EISA && EXPERIMENTAL
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called lne390.
+config MAC8390
+        bool "Macintosh NS 8390 based ethernet cards"
+        depends on MAC
+        select CRC32
+        ---help---
+          If you want to include a driver to support Nubus or LC-PDS
+          Ethernet cards using an NS8390 chipset or its equivalent, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+config NE2000
+        tristate "NE2000/NE1000 support"
+        depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX)
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.  Many Ethernet cards
+          without a specific driver are compatible with NE2000.
+          If you have a PCI NE2000 card however, say N here and Y to "PCI
+          NE2000 and clone support" under "EISA, VLB, PCI and on board
+          controllers" below. If you have a NE2000 card and are running on
+          an MCA system (a bus system used on some IBM PS/2 computers and
+          laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
+          below.
+          To compile this driver as a module, choose M here. The module
+          will be called ne.
+config NE2_MCA
+        tristate "NE/2 (ne2000 MCA version) support"
+        depends on MCA_LEGACY
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called ne2.
+config NE2K_PCI
+        tristate "PCI NE2000 and clones support (see help)"
+        depends on PCI
+        select CRC32
+        ---help---
+          This driver is for NE2000 compatible PCI cards. It will not work
+          with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
+          support" below). If you have a PCI NE2000 network (Ethernet) card,
+          say Y and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          This driver also works for the following NE2000 clone cards:
+          RealTek RTL-8029  Winbond 89C940  Compex RL2000  KTI ET32P2
+          NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
+          Holtek HT80232    Holtek HT80229
+          To compile this driver as a module, choose M here. The module
+          will be called ne2k-pci.
+config APNE
+        tristate "PCMCIA NE2000 support"
+        depends on AMIGA_PCMCIA
+        select CRC32
+        ---help---
+          If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
+          say N.
+          To compile this driver as a module, choose M here: the module
+          will be called apne.
+config NE3210
+        tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
+        depends on PCI && EISA && EXPERIMENTAL
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.  Note that this driver
+          will NOT WORK for NE3200 cards as they are completely different.
+          To compile this driver as a module, choose M here. The module
+          will be called ne3210.
+config PCMCIA_PCNET
+        tristate "NE2000 compatible PCMCIA support"
+        depends on PCMCIA
+        select CRC32
+        ---help---
+          Say Y here if you intend to attach an NE2000 compatible PCMCIA
+          (PC-card) Ethernet or Fast Ethernet card to your computer.
+          To compile this driver as a module, choose M here: the module will be
+          called pcnet_cs.  If unsure, say N.
+config NE_H8300
+        tristate "NE2000 compatible support for H8/300"
+        depends on H8300
+        ---help---
+          Say Y here if you want to use the NE2000 compatible
+          controller on the Renesas H8/300 processor.
+config STNIC
+        tristate "National DP83902AV  support"
+        depends on SUPERH
+        select CRC32
+        ---help---
+          Support for cards based on the National Semiconductor DP83902AV
+          ST-NIC Serial Network Interface Controller for Twisted Pair.  This
+          is a 10Mbit/sec Ethernet controller.  Product overview and specs at
+          <http://www.national.com/pf/DP/DP83902A.html>.
+          If unsure, say N.
+config ULTRAMCA
+        tristate "SMC Ultra MCA support"
+        depends on MCA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type and are running
+          an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called smc-mca.
+config ULTRA
+        tristate "SMC Ultra support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Important: There have been many reports that, with some motherboards
+          mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
+          such as some BusLogic models) causes corruption problems with many
+          operating systems. The Linux smc-ultra driver has a work-around for
+          this but keep it in mind if you have such a SCSI card and have
+          problems.
+          To compile this driver as a module, choose M here. The module
+          will be called smc-ultra.
+config ULTRA32
+        tristate "SMC Ultra32 EISA support"
+        depends on EISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called smc-ultra32.
+config WD80x3
+        tristate "WD80*3 support"
+        depends on ISA
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called wd.
+config ZORRO8390
+        tristate "Zorro NS8390-based Ethernet support"
+        depends on ZORRO
+        select CRC32
+        ---help---
+          This driver is for Zorro Ethernet cards using an NS8390-compatible
+          chipset, like the Village Tronic Ariadne II and the Individual
+          Computers X-Surf Ethernet cards. If you have such a card, say Y.
+          Otherwise, say N.
+          To compile this driver as a module, choose M here: the module
+          will be called zorro8390.
+endif # NET_VENDOR_8390
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
new file mode 100644
index 000000000000..3337d7fb4344
--- /dev/null
+++ b/drivers/net/ethernet/8390/Makefile
@@ -0,0 +1,29 @@
+#
+# Makefile for the 8390 network device drivers.
+#
+obj-$(CONFIG_MAC8390) += mac8390.o
+obj-$(CONFIG_AC3200) += ac3200.o 8390.o
+obj-$(CONFIG_APNE) += apne.o 8390.o
+obj-$(CONFIG_ARM_ETHERH) += etherh.o
+obj-$(CONFIG_AX88796) += ax88796.o
+obj-$(CONFIG_E2100) += e2100.o 8390.o
+obj-$(CONFIG_EL2) += 3c503.o 8390p.o
+obj-$(CONFIG_ES3210) += es3210.o 8390.o
+obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
+obj-$(CONFIG_HPLAN) += hp.o 8390p.o
+obj-$(CONFIG_HYDRA) += hydra.o 8390.o
+obj-$(CONFIG_LNE390) += lne390.o 8390.o
+obj-$(CONFIG_NE2000) += ne.o 8390p.o
+obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
+obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
+obj-$(CONFIG_NE3210) += ne3210.o 8390.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
+obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o 8390.o
+obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o
+obj-$(CONFIG_STNIC) += stnic.o 8390.o
+obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
+obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
+obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
+obj-$(CONFIG_WD80x3) += wd.o 8390.o
+obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
diff --git a/drivers/net/ac3200.c b/drivers/net/ethernet/8390/ac3200.c
index f07b2e980fbc..f07b2e980fbc 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ethernet/8390/ac3200.c
diff --git a/drivers/net/apne.c b/drivers/net/ethernet/8390/apne.c
index 547737340cbb..547737340cbb 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
diff --git a/drivers/net/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index e7cb8c8b9776..e7cb8c8b9776 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index 9953db711969..3e4b926c30dc 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -38,7 +38,7 @@
 #include <linux/etherdevice.h>
 #include <linux/crc32.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "8390.h"
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/e2100.c b/drivers/net/ethernet/8390/e2100.c
index d50a9998ae77..d50a9998ae77 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/ethernet/8390/e2100.c
diff --git a/drivers/net/es3210.c b/drivers/net/ethernet/8390/es3210.c
index 7a09575ecff0..7a09575ecff0 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/ethernet/8390/es3210.c
diff --git a/drivers/net/arm/etherh.c b/drivers/net/ethernet/8390/etherh.c
index 03e217a868d4..cf851faef311 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c
@@ -65,7 +65,7 @@
 static char version[] __initdata =
        "EtherH/EtherM Driver (c) 2002-2004 Russell King " DRV_VERSION "\n";
-#include "../lib8390.c"
+#include "lib8390.c"
 static unsigned int net_debug = NET_DEBUG;
diff --git a/drivers/net/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c
index 29917363ebfb..29917363ebfb 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/ethernet/8390/hp-plus.c
diff --git a/drivers/net/hp.c b/drivers/net/ethernet/8390/hp.c
index 18564d4a7c04..18564d4a7c04 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/ethernet/8390/hp.c
diff --git a/drivers/net/hydra.c b/drivers/net/ethernet/8390/hydra.c
index 1cd481c04202..1cd481c04202 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
diff --git a/drivers/net/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index 05ae21435bfd..05ae21435bfd 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
diff --git a/drivers/net/lne390.c b/drivers/net/ethernet/8390/lne390.c
index f9888d20177b..f9888d20177b 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/ethernet/8390/lne390.c
diff --git a/drivers/net/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index f84f5e6ededb..f84f5e6ededb 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c
index 7298a34bc795..7298a34bc795 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ethernet/8390/ne-h8300.c
diff --git a/drivers/net/ne.c b/drivers/net/ethernet/8390/ne.c
index 1063093b3afc..1063093b3afc 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
diff --git a/drivers/net/ne2.c b/drivers/net/ethernet/8390/ne2.c
index 70cdc6996342..70cdc6996342 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ethernet/8390/ne2.c
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 3c333cb5d34e..3c333cb5d34e 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
diff --git a/drivers/net/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index 243ed2aee88e..243ed2aee88e 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index b4fd7c3ed077..40107614b5dc 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -41,7 +41,7 @@
 #include <linux/log2.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "8390.h"
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c
index 34934fb23b97..34934fb23b97 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/ethernet/8390/smc-mca.c
diff --git a/drivers/net/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index ba44ede29198..ba44ede29198 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c
index e459c3b2510a..e459c3b2510a 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/ethernet/8390/smc-ultra32.c
diff --git a/drivers/net/stnic.c b/drivers/net/ethernet/8390/stnic.c
index d85f0a84bc7b..d85f0a84bc7b 100644
--- a/drivers/net/stnic.c
+++ b/drivers/net/ethernet/8390/stnic.c
diff --git a/drivers/net/wd.c b/drivers/net/ethernet/8390/wd.c
index 8831a3393ecf..8831a3393ecf 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/ethernet/8390/wd.c
diff --git a/drivers/net/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index 15e7751a273c..15e7751a273c 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
new file mode 100644
index 000000000000..d0a8fa8ab7ec
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig
@@ -0,0 +1,24 @@
+#
+# Ethernet LAN device configuration
+#
+menuconfig ETHERNET
+        bool "Ethernet driver support"
+        depends on NET
+        default y
+        ---help---
+          This section contains all the Ethernet device drivers.
+if ETHERNET
+source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/broadcom/Kconfig"
+source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/i825xx/Kconfig"
+source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/smsc/Kconfig"
+endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
new file mode 100644
index 000000000000..6d3276a48012
--- /dev/null
+++ b/drivers/net/ethernet/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the Linux network Ethernet device drivers.
+#
+obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
+obj-$(CONFIG_NET_VENDOR_8390) += 8390/
+obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
+obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
+obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/7990.c b/drivers/net/ethernet/amd/7990.c
index 60b35fb5f524..60b35fb5f524 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
diff --git a/drivers/net/7990.h b/drivers/net/ethernet/amd/7990.h
index 0a5837b96421..0a5837b96421 100644
--- a/drivers/net/7990.h
+++ b/drivers/net/ethernet/amd/7990.h
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
new file mode 100644
index 000000000000..05139403ea8d
--- /dev/null
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -0,0 +1,192 @@
+#
+# AMD network device configuration
+#
+config NET_VENDOR_AMD
+        bool "AMD devices"
+        depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
+                   SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
+                   (ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA
+        ---help---
+          If you have a network (Ethernet) chipset belonging to this class,
+          say Y.
+          Note that the answer to this question does not directly affect
+          the kernel: saying N will just case the configurator to skip all
+          the questions regarding AMD chipsets. If you say Y, you will be asked
+          for your specific chipset/driver in the following questions.
+if NET_VENDOR_AMD
+config A2065
+        tristate "A2065 support"
+        depends on ZORRO
+        select CRC32
+        ---help---
+          If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
+          say N.
+          To compile this driver as a module, choose M here: the module
+          will be called a2065.
+config AMD8111_ETH
+        tristate "AMD 8111 (new PCI LANCE) support"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          If you have an AMD 8111-based PCI LANCE ethernet card,
+          answer Y here and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called amd8111e.
+config LANCE
+        tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
+        depends on ISA && ISA_DMA_API
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
+          of this type.
+          To compile this driver as a module, choose M here: the module
+          will be called lance.  This is recommended.
+config PCNET32
+        tristate "AMD PCnet32 PCI support"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
+          answer Y here and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called pcnet32.
+config ARIADNE
+        tristate "Ariadne support"
+        depends on ZORRO
+        ---help---
+          If you have a Village Tronic Ariadne Ethernet adapter, say Y.
+          Otherwise, say N.
+          To compile this driver as a module, choose M here: the module
+          will be called ariadne.
+config ARM_AM79C961A
+        bool "ARM EBSA110 AM79C961A support"
+        depends on ARM && ARCH_EBSA110
+        select CRC32
+        ---help---
+          If you wish to compile a kernel for the EBSA-110, then you should
+          always answer Y to this.
+config ATARILANCE
+        tristate "Atari LANCE support"
+        depends on ATARI
+        ---help---
+          Say Y to include support for several Atari Ethernet adapters based
+          on the AMD LANCE chipset: RieblCard (with or without battery), or
+          PAMCard VME (also the version by Rhotron, with different addresses).
+config DECLANCE
+        tristate "DEC LANCE ethernet controller support"
+        depends on MACH_DECSTATION
+        select CRC32
+        ---help---
+          This driver is for the series of Ethernet controllers produced by
+          DEC (now Compaq) based on the AMD LANCE chipset, including the
+          DEPCA series.  (This chipset is better known via the NE2100 cards.)
+config DEPCA
+        tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
+        depends on (ISA || EISA || MCA)
+        select CRC32
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto> as well as
+          <file:drivers/net/depca.c>.
+          To compile this driver as a module, choose M here. The module
+          will be called depca.
+config HPLANCE
+        bool "HP on-board LANCE support"
+        depends on DIO
+        select CRC32
+        ---help---
+          If you want to use the builtin "LANCE" Ethernet controller on an
+          HP300 machine, say Y here.
+config MIPS_AU1X00_ENET
+        tristate "MIPS AU1000 Ethernet support"
+        depends on MIPS_ALCHEMY
+        select PHYLIB
+        select CRC32
+        ---help---
+          If you have an Alchemy Semi AU1X00 based system
+          say Y.  Otherwise, say N.
+config MVME147_NET
+        tristate "MVME147 (LANCE) Ethernet support"
+        depends on MVME147
+        select CRC32
+        ---help---
+          Support for the on-board Ethernet interface on the Motorola MVME147
+          single-board computer.  Say Y here to include the
+          driver for this chip in your kernel.
+          To compile this driver as a module, choose M here.
+config PCMCIA_NMCLAN
+        tristate "New Media PCMCIA support"
+        depends on PCMCIA
+        help
+          Say Y here if you intend to attach a New Media Ethernet or LiveWire
+          PCMCIA (PC-card) Ethernet card to your computer.
+          To compile this driver as a module, choose M here: the module will be
+          called nmclan_cs.  If unsure, say N.
+config NI65
+        tristate "NI6510 support"
+        depends on ISA && ISA_DMA_API
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called ni65.
+config SUN3LANCE
+        tristate "Sun3/Sun3x on-board LANCE support"
+        depends on (SUN3 || SUN3X)
+        ---help---
+          Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
+          featured an AMD LANCE 10Mbit Ethernet controller on board; say Y
+          here to compile in the Linux driver for this and enable Ethernet.
+          General Linux information on the Sun 3 and 3x series (now
+          discontinued) is at
+          <http://www.angelfire.com/ca2/tech68k/sun3.html>.
+          If you're not building a kernel for a Sun 3, say N.
+config SUNLANCE
+        tristate "Sun LANCE support"
+        depends on SBUS
+        select CRC32
+        ---help---
+          This driver supports the "le" interface present on all 32-bit Sparc
+          systems, on some older Ultra systems and as an Sbus option.  These
+          cards are based on the AMD LANCE chipset, which is better known
+          via the NE2100 cards.
+          To compile this driver as a module, choose M here: the module
+          will be called sunlance.
+endif # NET_VENDOR_AMD
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
new file mode 100644
index 000000000000..175caa5328c9
--- /dev/null
+++ b/drivers/net/ethernet/amd/Makefile
@@ -0,0 +1,20 @@
+#
+# Makefile for the AMD network device drivers.
+#
+obj-$(CONFIG_A2065) += a2065.o
+obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
+obj-$(CONFIG_ARIADNE) += ariadne.o
+obj-$(CONFIG_ATARILANCE) += atarilance.o
+obj-$(CONFIG_DECLANCE) += declance.o
+obj-$(CONFIG_DEPCA) += depca.o
+obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
+obj-$(CONFIG_LANCE) += lance.o
+obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
+obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
+obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o
+obj-$(CONFIG_NI65) += ni65.o
+obj-$(CONFIG_PCNET32) += pcnet32.o
+obj-$(CONFIG_SUN3LANCE) += sun3lance.o
+obj-$(CONFIG_SUNLANCE) += sunlance.o
diff --git a/drivers/net/a2065.c b/drivers/net/ethernet/amd/a2065.c
index e1e1b07d9b8d..e1e1b07d9b8d 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
diff --git a/drivers/net/a2065.h b/drivers/net/ethernet/amd/a2065.h
index 5117759d4e9c..5117759d4e9c 100644
--- a/drivers/net/a2065.h
+++ b/drivers/net/ethernet/amd/a2065.h
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index 52fe21e1e2cd..52fe21e1e2cd 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/ethernet/amd/am79c961a.h
index fd634d32756b..fd634d32756b 100644
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/ethernet/amd/am79c961a.h
diff --git a/drivers/net/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 78002ef9c0e5..78002ef9c0e5 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
diff --git a/drivers/net/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h
index 2ff2e7a12dd0..2ff2e7a12dd0 100644
--- a/drivers/net/amd8111e.h
+++ b/drivers/net/ethernet/amd/amd8111e.h
diff --git a/drivers/net/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index 7ed78f402042..7ed78f402042 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
diff --git a/drivers/net/ariadne.h b/drivers/net/ethernet/amd/ariadne.h
index 727be5cdd1ea..727be5cdd1ea 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ethernet/amd/ariadne.h
diff --git a/drivers/net/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 1264d781b554..1264d781b554 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
diff --git a/drivers/net/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index b9debcfb61a0..b9debcfb61a0 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
diff --git a/drivers/net/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h
index 6229c774552c..6229c774552c 100644
--- a/drivers/net/au1000_eth.h
+++ b/drivers/net/ethernet/amd/au1000_eth.h
diff --git a/drivers/net/declance.c b/drivers/net/ethernet/amd/declance.c
index d5598f6584a3..d5598f6584a3 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
diff --git a/drivers/net/depca.c b/drivers/net/ethernet/amd/depca.c
index f2015a851977..f2015a851977 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/ethernet/amd/depca.c
diff --git a/drivers/net/depca.h b/drivers/net/ethernet/amd/depca.h
index ee42648dbde6..ee42648dbde6 100644
--- a/drivers/net/depca.h
+++ b/drivers/net/ethernet/amd/depca.h
diff --git a/drivers/net/hplance.c b/drivers/net/ethernet/amd/hplance.c
index a900d5bf2948..a900d5bf2948 100644
--- a/drivers/net/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c
diff --git a/drivers/net/hplance.h b/drivers/net/ethernet/amd/hplance.h
index 04aee9e0376a..04aee9e0376a 100644
--- a/drivers/net/hplance.h
+++ b/drivers/net/ethernet/amd/hplance.h
diff --git a/drivers/net/lance.c b/drivers/net/ethernet/amd/lance.c
index 02336edce748..02336edce748 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/ethernet/amd/lance.c
diff --git a/drivers/net/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index 3a7ad840d5b5..3a7ad840d5b5 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c
diff --git a/drivers/net/ni65.c b/drivers/net/ethernet/amd/ni65.c
index c75ae85eb918..c75ae85eb918 100644
--- a/drivers/net/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
diff --git a/drivers/net/ni65.h b/drivers/net/ethernet/amd/ni65.h
index e6217e35edf0..e6217e35edf0 100644
--- a/drivers/net/ni65.h
+++ b/drivers/net/ethernet/amd/ni65.h
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 9d70b6595220..9d70b6595220 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
diff --git a/drivers/net/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 8b3090dc4bcd..8b3090dc4bcd 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
diff --git a/drivers/net/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 7d9ec23aabf6..7d9ec23aabf6 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
diff --git a/drivers/net/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 06f2d4382dc4..06f2d4382dc4 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
new file mode 100644
index 000000000000..8986e57d7f9c
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -0,0 +1,119 @@
+#
+# Broadcom device configuration
+#
+config NET_VENDOR_BROADCOM
+        bool "Broadcom devices"
+        depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \
+                   SIBYTE_SB1xxx_SOC
+        ---help---
+          If you have a network (Ethernet) chipset belonging to this class,
+          say Y.
+          Note that the answer to this question does not directly affect
+          the kernel: saying N will just case the configurator to skip all
+          the questions regarding AMD chipsets. If you say Y, you will be asked
+          for your specific chipset/driver in the following questions.
+if NET_VENDOR_BROADCOM
+config B44
+        tristate "Broadcom 440x/47xx ethernet support"
+        depends on SSB_POSSIBLE && HAS_DMA
+        select SSB
+        select MII
+        ---help---
+          If you have a network (Ethernet) controller of this type, say Y
+          or M and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called b44.
+# Auto-select SSB PCI-HOST support, if possible
+config B44_PCI_AUTOSELECT
+        bool
+        depends on B44 && SSB_PCIHOST_POSSIBLE
+        select SSB_PCIHOST
+        default y
+# Auto-select SSB PCICORE driver, if possible
+config B44_PCICORE_AUTOSELECT
+        bool
+        depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
+        select SSB_DRIVER_PCICORE
+        default y
+config B44_PCI
+        bool
+        depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
+        default y
+config BCM63XX_ENET
+        tristate "Broadcom 63xx internal mac support"
+        depends on BCM63XX
+        select MII
+        select PHYLIB
+        help
+          This driver supports the ethernet MACs in the Broadcom 63xx
+          MIPS chipset family (BCM63XX).
+config BNX2
+        tristate "Broadcom NetXtremeII support"
+        depends on PCI
+        select CRC32
+        select FW_LOADER
+        ---help---
+          This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called bnx2.  This is recommended.
+config CNIC
+        tristate "Broadcom CNIC support"
+        depends on PCI
+        select BNX2
+        select UIO
+        ---help---
+          This driver supports offload features of Broadcom NetXtremeII
+          gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called cnic.  This is recommended.
+config SB1250_MAC
+        tristate "SB1250 Gigabit Ethernet support"
+        depends on SIBYTE_SB1xxx_SOC
+        select PHYLIB
+        ---help---
+          This driver supports Gigabit Ethernet interfaces based on the
+          Broadcom SiByte family of System-On-a-Chip parts.  They include
+          the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
+          and BCM1480 chips.
+          To compile this driver as a module, choose M here: the module
+          will be called sb1250-mac.
+config TIGON3
+        tristate "Broadcom Tigon3 support"
+        depends on PCI
+        select PHYLIB
+        ---help---
+          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called tg3.  This is recommended.
+config BNX2X
+        tristate "Broadcom NetXtremeII 10Gb support"
+        depends on PCI
+        select FW_LOADER
+        select ZLIB_INFLATE
+        select LIBCRC32C
+        select MDIO
+        ---help---
+          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called bnx2x.  This is recommended.
+endif # NET_VENDOR_BROADCOM
diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile
new file mode 100644
index 000000000000..b7896051d54e
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Broadcom network device drivers.
+#
+obj-$(CONFIG_B44) += b44.o
+obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
+obj-$(CONFIG_BNX2) += bnx2.o
+obj-$(CONFIG_CNIC) += cnic.o
+obj-$(CONFIG_BNX2X) += bnx2x/
+obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
+obj-$(CONFIG_TIGON3) += tg3.o
diff --git a/drivers/net/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 41ea84e3f69c..41ea84e3f69c 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
diff --git a/drivers/net/b44.h b/drivers/net/ethernet/broadcom/b44.h
index e1905a49279f..e1905a49279f 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/ethernet/broadcom/b44.h
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 1d9b9858067c..1d9b9858067c 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
index 0e3048b788c2..0e3048b788c2 100644
--- a/drivers/net/bcm63xx_enet.h
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
diff --git a/drivers/net/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 4b2b57018a02..4b2b57018a02 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
diff --git a/drivers/net/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index fc50d4267df8..fc50d4267df8 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h
index 940eb91f209d..940eb91f209d 100644
--- a/drivers/net/bnx2_fw.h
+++ b/drivers/net/ethernet/broadcom/bnx2_fw.h
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile
index 48fbdd48f88f..48fbdd48f88f 100644
--- a/drivers/net/bnx2x/Makefile
+++ b/drivers/net/ethernet/broadcom/bnx2x/Makefile
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index c423504a755f..c423504a755f 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index d724a18b5285..d724a18b5285 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 223bfeebc597..223bfeebc597 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index a4ea35f6a456..a4ea35f6a456 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
diff --git a/drivers/net/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
index 2c6a3bca6f28..2c6a3bca6f28 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
diff --git a/drivers/net/bnx2x/bnx2x_dump.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
index b983825d0ee9..b983825d0ee9 100644
--- a/drivers/net/bnx2x/bnx2x_dump.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 221863059dae..221863059dae 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
diff --git a/drivers/net/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index 998652a1b858..998652a1b858 100644
--- a/drivers/net/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
diff --git a/drivers/net/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
index f4a07fbaed05..f4a07fbaed05 100644
--- a/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index dc24de40e336..dc24de40e336 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
diff --git a/drivers/net/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
index 4d748e77d1ac..4d748e77d1ac 100644
--- a/drivers/net/bnx2x/bnx2x_init.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
diff --git a/drivers/net/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
index 7ec1724753ad..7ec1724753ad 100644
--- a/drivers/net/bnx2x/bnx2x_init_ops.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index d45b1555a602..d45b1555a602 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index c12db6da213e..c12db6da213e 100644
--- a/drivers/net/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 150709111548..150709111548 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index 27b5ecb11830..27b5ecb11830 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
diff --git a/drivers/net/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index df52f110c6c5..df52f110c6c5 100644
--- a/drivers/net/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
diff --git a/drivers/net/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 9a517c2e9f1b..9a517c2e9f1b 100644
--- a/drivers/net/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 771f6803b238..771f6803b238 100644
--- a/drivers/net/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
diff --git a/drivers/net/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 5d8ce2f6afef..5d8ce2f6afef 100644
--- a/drivers/net/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
diff --git a/drivers/net/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 94a2e541006d..769816104a6d 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -45,8 +45,8 @@
 #include "bnx2x/bnx2x_reg.h"
 #include "bnx2x/bnx2x_fw_defs.h"
 #include "bnx2x/bnx2x_hsi.h"
-#include "../scsi/bnx2i/57xx_iscsi_constants.h"
+#include "../../../scsi/bnx2i/57xx_iscsi_constants.h"
-#include "../scsi/bnx2i/57xx_iscsi_hsi.h"
+#include "../../../scsi/bnx2i/57xx_iscsi_hsi.h"
 #include "cnic.h"
 #include "cnic_defs.h"
diff --git a/drivers/net/cnic.h b/drivers/net/ethernet/broadcom/cnic.h
index 7a2928f82d40..7a2928f82d40 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/ethernet/broadcom/cnic.h
diff --git a/drivers/net/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
index e47d21076767..e47d21076767 100644
--- a/drivers/net/cnic_defs.h
+++ b/drivers/net/ethernet/broadcom/cnic_defs.h
diff --git a/drivers/net/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 79443e0dbf96..79443e0dbf96 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index ea65f7ec360a..ea65f7ec360a 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
diff --git a/drivers/net/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index dc3fbf61910b..dc3fbf61910b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
diff --git a/drivers/net/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 2ea456dd5880..2ea456dd5880 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
new file mode 100644
index 000000000000..7b54574107ce
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/Kconfig
@@ -0,0 +1,106 @@
+#
+# Chelsio device configuration
+#
+config NET_VENDOR_CHELSIO
+        bool "Chelsio devices"
+        depends on PCI || INET
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Chelsio devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_CHELSIO
+config CHELSIO_T1
+        tristate "Chelsio 10Gb Ethernet support"
+        depends on PCI
+        select CRC32
+        select MDIO
+        ---help---
+          This driver supports Chelsio gigabit and 10-gigabit
+          Ethernet cards. More information about adapter features and
+          performance tuning is in <file:Documentation/networking/cxgb.txt>.
+          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.html>.
+          Please send feedback to <linux-bugs@chelsio.com>.
+          To compile this driver as a module, choose M here: the module
+          will be called cxgb.
+config CHELSIO_T1_1G
+        bool "Chelsio gigabit Ethernet support"
+        depends on CHELSIO_T1
+        ---help---
+          Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
+          are using only 10G cards say 'N' here.
+config CHELSIO_T3
+        tristate "Chelsio Communications T3 10Gb Ethernet support"
+        depends on PCI && INET
+        select FW_LOADER
+        select MDIO
+        ---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.html>.
+          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 CHELSIO_T4
+        tristate "Chelsio Communications T4 Ethernet support"
+        depends on PCI
+        select FW_LOADER
+        select MDIO
+        ---help---
+          This driver supports Chelsio T4-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.html>.
+          Please send feedback to <linux-bugs@chelsio.com>.
+          To compile this driver as a module choose M here; the module
+          will be called cxgb4.
+config CHELSIO_T4VF
+        tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+        depends on PCI
+        ---help---
+          This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+          adapters with PCI-E SR-IOV Virtual Functions.
+          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.html>.
+          Please send feedback to <linux-bugs@chelsio.com>.
+          To compile this driver as a module choose M here; the module
+          will be called cxgb4vf.
+endif # NET_VENDOR_CHELSIO
diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile
new file mode 100644
index 000000000000..390510b5e90f
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Chelsio network device drivers.
+#
+obj-$(CONFIG_CHELSIO_T1) += cxgb/
+obj-$(CONFIG_CHELSIO_T3) += cxgb3/
+obj-$(CONFIG_CHELSIO_T4) += cxgb4/
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/ethernet/chelsio/cxgb/Makefile
index 57a4b262fd3f..57a4b262fd3f 100644
--- a/drivers/net/chelsio/Makefile
+++ b/drivers/net/ethernet/chelsio/cxgb/Makefile
diff --git a/drivers/net/chelsio/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h
index 5ccbed1784d2..5ccbed1784d2 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/ethernet/chelsio/cxgb/common.h
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/ethernet/chelsio/cxgb/cphy.h
index 1f095a9fc739..1f095a9fc739 100644
--- a/drivers/net/chelsio/cphy.h
+++ b/drivers/net/ethernet/chelsio/cxgb/cphy.h
diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
index e36d45b78cc7..e36d45b78cc7 100644
--- a/drivers/net/chelsio/cpl5_cmd.h
+++ b/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index 3edbbc4c5112..3edbbc4c5112 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
diff --git a/drivers/net/chelsio/elmer0.h b/drivers/net/ethernet/chelsio/cxgb/elmer0.h
index eef655c827d9..eef655c827d9 100644
--- a/drivers/net/chelsio/elmer0.h
+++ b/drivers/net/ethernet/chelsio/cxgb/elmer0.h
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c
index 639ff1955739..639ff1955739 100644
--- a/drivers/net/chelsio/espi.c
+++ b/drivers/net/ethernet/chelsio/cxgb/espi.c
diff --git a/drivers/net/chelsio/espi.h b/drivers/net/ethernet/chelsio/cxgb/espi.h
index 5694aad4fbc0..5694aad4fbc0 100644
--- a/drivers/net/chelsio/espi.h
+++ b/drivers/net/ethernet/chelsio/cxgb/espi.h
diff --git a/drivers/net/chelsio/fpga_defs.h b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
index ccdb2bc9ae98..ccdb2bc9ae98 100644
--- a/drivers/net/chelsio/fpga_defs.h
+++ b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/ethernet/chelsio/cxgb/gmac.h
index d42337457cf7..d42337457cf7 100644
--- a/drivers/net/chelsio/gmac.h
+++ b/drivers/net/ethernet/chelsio/cxgb/gmac.h
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
index 71018a4fdf15..71018a4fdf15 100644
--- a/drivers/net/chelsio/mv88e1xxx.c
+++ b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
diff --git a/drivers/net/chelsio/mv88e1xxx.h b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
index 967cc4286359..967cc4286359 100644
--- a/drivers/net/chelsio/mv88e1xxx.h
+++ b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
index f7136b2fd1e5..f7136b2fd1e5 100644
--- a/drivers/net/chelsio/mv88x201x.c
+++ b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c
index a683fd3bb624..a683fd3bb624 100644
--- a/drivers/net/chelsio/my3126.c
+++ b/drivers/net/ethernet/chelsio/cxgb/my3126.c
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/ethernet/chelsio/cxgb/pm3393.c
index 40c7b93ababc..40c7b93ababc 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/ethernet/chelsio/cxgb/pm3393.c
diff --git a/drivers/net/chelsio/regs.h b/drivers/net/ethernet/chelsio/cxgb/regs.h
index c80bf4d6d0a6..c80bf4d6d0a6 100644
--- a/drivers/net/chelsio/regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb/regs.h
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
index e9a03fffef15..e9a03fffef15 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h
index e03980bcdd65..e03980bcdd65 100644
--- a/drivers/net/chelsio/sge.h
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.h
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c
index 8a43c7e19701..8a43c7e19701 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/ethernet/chelsio/cxgb/subr.c
diff --git a/drivers/net/chelsio/suni1x10gexp_regs.h b/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
index d0f87d82566a..d0f87d82566a 100644
--- a/drivers/net/chelsio/suni1x10gexp_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
diff --git a/drivers/net/chelsio/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c
index 8bed4a59e65f..8bed4a59e65f 100644
--- a/drivers/net/chelsio/tp.c
+++ b/drivers/net/ethernet/chelsio/cxgb/tp.c
diff --git a/drivers/net/chelsio/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h
index dfd8ce25106a..dfd8ce25106a 100644
--- a/drivers/net/chelsio/tp.h
+++ b/drivers/net/ethernet/chelsio/cxgb/tp.h
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
index b0cb388f5e12..b0cb388f5e12 100644
--- a/drivers/net/chelsio/vsc7326.c
+++ b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
diff --git a/drivers/net/chelsio/vsc7326_reg.h b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
index 479edbcabe68..479edbcabe68 100644
--- a/drivers/net/chelsio/vsc7326_reg.h
+++ b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
diff --git a/drivers/net/cxgb3/Makefile b/drivers/net/ethernet/chelsio/cxgb3/Makefile
index 29aff78c7820..29aff78c7820 100644
--- a/drivers/net/cxgb3/Makefile
+++ b/drivers/net/ethernet/chelsio/cxgb3/Makefile
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
index 8b395b537330..8b395b537330 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
index 2028da95afa1..2028da95afa1 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/ethernet/chelsio/cxgb3/aq100x.c
index 341b7ef1508f..341b7ef1508f 100644
--- a/drivers/net/cxgb3/aq100x.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/aq100x.c
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h
index df01b6343241..df01b6343241 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/common.h
diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h
index 369fe711fd7f..369fe711fd7f 100644
--- a/drivers/net/cxgb3/cxgb3_ctl_defs.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h
diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h
index 920d918ed193..920d918ed193 100644
--- a/drivers/net/cxgb3/cxgb3_defs.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h
diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h
index b19e4376ba76..b19e4376ba76 100644
--- a/drivers/net/cxgb3/cxgb3_ioctl.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 93b41a7ac175..93b41a7ac175 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 805076c54f1b..805076c54f1b 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h
index 929c298115ca..929c298115ca 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h
diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
index 0d9b0e6dccff..0d9b0e6dccff 100644
--- a/drivers/net/cxgb3/firmware_exports.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index f452c4003253..f452c4003253 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
index 7a12d52ed4fc..7a12d52ed4fc 100644
--- a/drivers/net/cxgb3/l2t.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/ethernet/chelsio/cxgb3/mc5.c
index e13b7fe9d082..e13b7fe9d082 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/mc5.c
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h
index 6990f6c65221..6990f6c65221 100644
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/regs.h
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index d6fa1777a343..d6fa1777a343 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
diff --git a/drivers/net/cxgb3/sge_defs.h b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
index 29b6c800b238..29b6c800b238 100644
--- a/drivers/net/cxgb3/sge_defs.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h
index 852c399a8b0a..852c399a8b0a 100644
--- a/drivers/net/cxgb3/t3_cpl.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
index 44ac2f40b644..44ac2f40b644 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
index 705713b56636..705713b56636 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h
index 8bda06e366c8..8bda06e366c8 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/version.h
diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
index 4f9a1c2724f4..4f9a1c2724f4 100644
--- a/drivers/net/cxgb3/vsc8211.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
index 3af19a550372..3af19a550372 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
diff --git a/drivers/net/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile
index 498667487f52..498667487f52 100644
--- a/drivers/net/cxgb4/Makefile
+++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile
diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 223a7f72343b..223a7f72343b 100644
--- a/drivers/net/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index c9957b7f17b5..c9957b7f17b5 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
diff --git a/drivers/net/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
index b1d39b8d141a..b1d39b8d141a 100644
--- a/drivers/net/cxgb4/cxgb4_uld.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
diff --git a/drivers/net/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index a2d323c473f8..a2d323c473f8 100644
--- a/drivers/net/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
diff --git a/drivers/net/cxgb4/l2t.h b/drivers/net/ethernet/chelsio/cxgb4/l2t.h
index 02b31d0c6410..02b31d0c6410 100644
--- a/drivers/net/cxgb4/l2t.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.h
diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index 56adf448b9fe..56adf448b9fe 100644
--- a/drivers/net/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index d1ec111aebd8..d1ec111aebd8 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
diff --git a/drivers/net/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
index c26b455f37de..c26b455f37de 100644
--- a/drivers/net/cxgb4/t4_hw.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index eb71b8250b91..eb71b8250b91 100644
--- a/drivers/net/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
diff --git a/drivers/net/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
index 0adc5bcec7c4..0adc5bcec7c4 100644
--- a/drivers/net/cxgb4/t4_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
index edcfd7ec7802..edcfd7ec7802 100644
--- a/drivers/net/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
diff --git a/drivers/net/cxgb4vf/Makefile b/drivers/net/ethernet/chelsio/cxgb4vf/Makefile
index d72ee26cb4c7..d72ee26cb4c7 100644
--- a/drivers/net/cxgb4vf/Makefile
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/Makefile
diff --git a/drivers/net/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
index 594334d5c711..594334d5c711 100644
--- a/drivers/net/cxgb4vf/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index ec799139dfe2..ec799139dfe2 100644
--- a/drivers/net/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index cffb328c46c3..cffb328c46c3 100644
--- a/drivers/net/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
diff --git a/drivers/net/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
index a65c80aed1f2..a65c80aed1f2 100644
--- a/drivers/net/cxgb4vf/t4vf_common.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
diff --git a/drivers/net/cxgb4vf/t4vf_defs.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h
index c7b127d93767..c7b127d93767 100644
--- a/drivers/net/cxgb4vf/t4vf_defs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
index fe3fd3dad6f7..fe3fd3dad6f7 100644
--- a/drivers/net/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
diff --git a/drivers/net/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index 88d766ee0e1b..88d766ee0e1b 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
diff --git a/drivers/net/3c505.h b/drivers/net/ethernet/i825xx/3c505.h
index 04df2a9002b6..04df2a9002b6 100644
--- a/drivers/net/3c505.h
+++ b/drivers/net/ethernet/i825xx/3c505.h
diff --git a/drivers/net/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
index 1e945551c144..1e945551c144 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/ethernet/i825xx/3c507.c
diff --git a/drivers/net/3c523.c b/drivers/net/ethernet/i825xx/3c523.c
index bc0d1a1c2e28..bc0d1a1c2e28 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/ethernet/i825xx/3c523.c
diff --git a/drivers/net/3c523.h b/drivers/net/ethernet/i825xx/3c523.h
index 6956441687b9..6956441687b9 100644
--- a/drivers/net/3c523.h
+++ b/drivers/net/ethernet/i825xx/3c523.h
diff --git a/drivers/net/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
index d9d056d207f3..d9d056d207f3 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/ethernet/i825xx/3c527.c
diff --git a/drivers/net/3c527.h b/drivers/net/ethernet/i825xx/3c527.h
index d693b8d15cde..d693b8d15cde 100644
--- a/drivers/net/3c527.h
+++ b/drivers/net/ethernet/i825xx/3c527.h
diff --git a/drivers/net/82596.c b/drivers/net/ethernet/i825xx/82596.c
index be1f1970c842..be1f1970c842 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
new file mode 100644
index 000000000000..5c30a5b3cba9
--- /dev/null
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -0,0 +1,182 @@
+#
+# Intel 82596/82593/82596 network device configuration
+#
+config NET_VENDOR_I825XX
+        bool "Intel (82586/82593/82596) devices"
+        depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
+                   ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
+                   GSC || BVME6000 || MVME16x || EXPERIMENTAL)
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question does not directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about these devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_I825XX
+config ELPLUS
+        tristate "3c505 \"EtherLink Plus\" support"
+        depends on ISA && ISA_DMA_API
+        ---help---
+          Information about this network (Ethernet) card can be found in
+          <file:Documentation/networking/3c505.txt>.  If you have a card of
+          this type, say Y and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c505.
+config EL16
+        tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
+        depends on ISA && EXPERIMENTAL
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c507.
+config ELMC
+        tristate "3c523 \"EtherLink/MC\" support"
+        depends on MCA_LEGACY
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c523.
+config ELMC_II
+        tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
+        depends on MCA && MCA_LEGACY
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called 3c527.
+config ARM_ETHER1
+        tristate "Acorn Ether1 support"
+        depends on ARM && ARCH_ACORN
+        ---help---
+          If you have an Acorn system with one of these (AKA25) network cards,
+          you should say Y to this option if you wish to use it with Linux.
+config APRICOT
+        tristate "Apricot Xen-II on board Ethernet"
+        depends on ISA
+        ---help---
+          If you have a network (Ethernet) controller of this type, say Y and
+          read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called apricot.
+config BVME6000_NET
+        tristate "BVME6000 Ethernet support"
+        depends on BVME6000MVME16x
+        ---help---
+          This is the driver for the Ethernet interface on BVME4000 and
+          BVME6000 VME boards.  Say Y here to include the driver for this chip
+          in your kernel.
+          To compile this driver as a module, choose M here.
+config EEXPRESS
+        tristate "EtherExpress 16 support"
+        depends on ISA
+        ---help---
+          If you have an EtherExpress16 network (Ethernet) card, say Y and
+          read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.  Note that the Intel
+          EtherExpress16 card used to be regarded as a very poor choice
+          because the driver was very unreliable. We now have a new driver
+          that should do better.
+          To compile this driver as a module, choose M here. The module
+          will be called eexpress.
+config EEXPRESS_PRO
+        tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
+        depends on ISA
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y. This
+          driver supports Intel i82595{FX,TX} based boards. Note however
+          that the EtherExpress PRO/100 Ethernet card has its own separate
+          driver.  Please read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called eepro.
+config LASI_82596
+        tristate "Lasi ethernet"
+        depends on GSC
+        ---help---
+          Say Y here to support the builtin Intel 82596 ethernet controller
+          found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
+config LP486E
+        tristate "LP486E on board Ethernet"
+        depends on ISA
+        ---help---
+          Say Y here to support the 82596-based on-board Ethernet controller
+          for the Panther motherboard, which is one of the two shipped in the
+          Intel Professional Workstation.
+config MVME16x_NET
+        tristate "MVME16x Ethernet support"
+        depends on MVME16x
+        ---help---
+          This is the driver for the Ethernet interface on the Motorola
+          MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
+          driver for this chip in your kernel.
+          To compile this driver as a module, choose M here.
+config NI52
+        tristate "NI5210 support"
+        depends on ISA
+        ---help---
+          If you have a network (Ethernet) card of this type, say Y and read
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called ni52.
+config SNI_82596
+        tristate "SNI RM ethernet"
+        depends on SNI_RM
+        ---help---
+          Say Y here to support the on-board Intel 82596 ethernet controller
+          built into SNI RM machines.
+config SUN3_82586
+        bool "Sun3 on-board Intel 82586 support"
+        depends on SUN3
+        ---help---
+          This driver enables support for the on-board Intel 82586 based
+          Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
+          that this driver does not support 82586-based adapters on additional
+          VME boards.
+config ZNET
+        tristate "Zenith Z-Note support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && ISA_DMA_API
+        ---help---
+          The Zenith Z-Note notebook computer has a built-in network
+          (Ethernet) card, and this is the Linux driver for it. Note that the
+          IBM Thinkpad 300 is compatible with the Z-Note and is also supported
+          by this driver. Read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+endif # NET_VENDOR_I825XX
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
new file mode 100644
index 000000000000..f68a3694968a
--- /dev/null
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -0,0 +1,20 @@
+#
+# Makefile for the Intel 82586/82593/82596 chipset device drivers.
+#
+obj-$(CONFIG_ARM_ETHER1) += ether1.o
+obj-$(CONFIG_EEXPRESS) += eexpress.o
+obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
+obj-$(CONFIG_ELPLUS) += 3c505.o
+obj-$(CONFIG_EL16) += 3c507.o
+obj-$(CONFIG_ELMC) += 3c523.o
+obj-$(CONFIG_ELMC_II) += 3c527.o
+obj-$(CONFIG_LP486E) += lp486e.o
+obj-$(CONFIG_NI52) += ni52.o
+obj-$(CONFIG_SUN3_82586) += sun3_82586.o
+obj-$(CONFIG_ZNET) += znet.o
+obj-$(CONFIG_APRICOT) += 82596.o
+obj-$(CONFIG_LASI_82596) += lasi_82596.o
+obj-$(CONFIG_SNI_82596) += sni_82596.o
+obj-$(CONFIG_MVME16x_NET) += 82596.o
+obj-$(CONFIG_BVME6000_NET) += 82596.o
diff --git a/drivers/net/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
index dfeb006035df..dfeb006035df 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/ethernet/i825xx/eepro.c
diff --git a/drivers/net/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index a19228563efd..a19228563efd 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
diff --git a/drivers/net/eexpress.h b/drivers/net/ethernet/i825xx/eexpress.h
index dc9c6ea289e9..dc9c6ea289e9 100644
--- a/drivers/net/eexpress.h
+++ b/drivers/net/ethernet/i825xx/eexpress.h
diff --git a/drivers/net/arm/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index b00781c02d5d..b00781c02d5d 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
diff --git a/drivers/net/arm/ether1.h b/drivers/net/ethernet/i825xx/ether1.h
index 3a5830ab3dc7..3a5830ab3dc7 100644
--- a/drivers/net/arm/ether1.h
+++ b/drivers/net/ethernet/i825xx/ether1.h
diff --git a/drivers/net/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
index 6eba352c52e0..6eba352c52e0 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/ethernet/i825xx/lasi_82596.c
diff --git a/drivers/net/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index 9e042894479b..9e042894479b 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
diff --git a/drivers/net/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 385a95311cd2..385a95311cd2 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
diff --git a/drivers/net/ni52.c b/drivers/net/ethernet/i825xx/ni52.c
index d973fc6c6b88..d973fc6c6b88 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ethernet/i825xx/ni52.c
diff --git a/drivers/net/ni52.h b/drivers/net/ethernet/i825xx/ni52.h
index 0a03b2883327..0a03b2883327 100644
--- a/drivers/net/ni52.h
+++ b/drivers/net/ethernet/i825xx/ni52.h
diff --git a/drivers/net/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c
index 6b2a88817473..6b2a88817473 100644
--- a/drivers/net/sni_82596.c
+++ b/drivers/net/ethernet/i825xx/sni_82596.c
diff --git a/drivers/net/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index b6ae53bada75..b6ae53bada75 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
diff --git a/drivers/net/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h
index 93346f00486b..93346f00486b 100644
--- a/drivers/net/sun3_82586.h
+++ b/drivers/net/ethernet/i825xx/sun3_82586.h
diff --git a/drivers/net/znet.c b/drivers/net/ethernet/i825xx/znet.c
index 8b8881718f5e..8b8881718f5e 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/ethernet/i825xx/znet.c
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
new file mode 100644
index 000000000000..5fe185ba07bc
--- /dev/null
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -0,0 +1,220 @@
+#
+# Intel network device configuration
+#
+config NET_VENDOR_INTEL
+        bool "Intel devices"
+        depends on PCI || PCI_MSI
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Intel cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_INTEL
+config E100
+        tristate "Intel(R) PRO/100+ support"
+        depends on PCI
+        select MII
+        ---help---
+          This driver supports Intel(R) PRO/100 family of adapters.
+          To verify that your adapter is supported, find the board ID number
+          on the adapter. Look for a label that has a barcode and a number
+          in the format 123456-001 (six digits hyphen three digits).
+          Use the above information and the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          to identify the adapter.
+          For the latest Intel PRO/100 network driver for Linux, see:
+          <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/e100.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called e100.
+config E1000
+        tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
+        depends on PCI
+        ---help---
+          This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+          adapters.  For more information on how to identify your adapter, go
+          to the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/e1000.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called e1000.
+config E1000E
+        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+        depends on PCI && (!SPARC32 || BROKEN)
+        select CRC32
+        ---help---
+          This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
+          ethernet family of adapters. For PCI or PCI-X e1000 adapters,
+          use the regular e1000 driver For more information on how to
+          identify your adapter, go to the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          To compile this driver as a module, choose M here. The module
+          will be called e1000e.
+config IGB
+        tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
+        depends on PCI
+        ---help---
+          This driver supports Intel(R) 82575/82576 gigabit ethernet family of
+          adapters.  For more information on how to identify your adapter, go
+          to the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/e1000.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called igb.
+config IGB_DCA
+        bool "Direct Cache Access (DCA) Support"
+        default y
+        depends on IGB && DCA && !(IGB=y && DCA=m)
+        ---help---
+          Say Y here if you want to use Direct Cache Access (DCA) in the
+          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 IGBVF
+        tristate "Intel(R) 82576 Virtual Function Ethernet support"
+        depends on PCI
+        ---help---
+          This driver supports Intel(R) 82576 virtual functions.  For more
+          information on how to identify your adapter, go to the Adapter &
+          Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/e1000.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called igbvf.
+config IXGB
+        tristate "Intel(R) PRO/10GbE support"
+        depends on PCI
+        ---help---
+          This driver supports Intel(R) PRO/10GbE family of adapters for
+          PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
+          instead. For more information on how to identify your adapter, go
+          to the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/ixgb.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called ixgb.
+config IXGBE
+        tristate "Intel(R) 10GbE PCI Express adapters support"
+        depends on PCI && INET
+        select MDIO
+        ---help---
+          This driver supports Intel(R) 10GbE PCI Express family of
+          adapters.  For more information on how to identify your adapter, go
+          to the Adapter & Driver ID Guide at:
+          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          To compile this driver as a module, choose M here. The module
+          will be called ixgbe.
+config IXGBE_DCA
+        bool "Direct Cache Access (DCA) Support"
+        default y
+        depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+        ---help---
+          Say Y here if you want to use Direct Cache Access (DCA) in the
+          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 IXGBEVF
+        tristate "Intel(R) 82599 Virtual Function Ethernet support"
+        depends on PCI_MSI
+        ---help---
+          This driver supports Intel(R) 82599 virtual functions.  For more
+          information on how to identify your adapter, go to the Adapter &
+          Driver ID Guide at:
+          <http://support.intel.com/support/network/sb/CS-008441.htm>
+          For general information and support, go to the Intel support
+          website at:
+          <http://support.intel.com>
+          More specific information on configuring the driver is in
+          <file:Documentation/networking/ixgbevf.txt>.
+          To compile this driver as a module, choose M here. The module
+          will be called ixgbevf.  MSI-X interrupt support is required
+          for this driver to work correctly.
+endif # NET_VENDOR_INTEL
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
new file mode 100644
index 000000000000..c8210e688669
--- /dev/null
+++ b/drivers/net/ethernet/intel/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Intel network device drivers.
+#
+obj-$(CONFIG_E100) += e100.o
+obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGBVF) += igbvf/
+obj-$(CONFIG_IXGBE) += ixgbe/
+obj-$(CONFIG_IXGBEVF) += ixgbevf/
+obj-$(CONFIG_IXGB) += ixgb/
diff --git a/drivers/net/e100.c b/drivers/net/ethernet/intel/e100.c
index c1352c60c299..c1352c60c299 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
diff --git a/drivers/net/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile
index 4a6ab1522451..4a6ab1522451 100644
--- a/drivers/net/e1000/Makefile
+++ b/drivers/net/ethernet/intel/e1000/Makefile
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 24f41da8c4be..24f41da8c4be 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 5548d464261a..5548d464261a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index 8545c7aa93eb..8545c7aa93eb 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h
index 5c9a8403668b..5c9a8403668b 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.h
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index f97afda941d7..f97afda941d7 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
index 33e7c45a4fe4..33e7c45a4fe4 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
index 1301eba8b57a..1301eba8b57a 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index e4f42257c24c..e4f42257c24c 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 480f2592f8a5..480f2592f8a5 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
index 28519acacd2d..948c05db5d68 100644
--- a/drivers/net/e1000e/Makefile
+++ b/drivers/net/ethernet/intel/e1000e/Makefile
@@ -32,6 +32,6 @@
 obj-$(CONFIG_E1000E) += e1000e.o
-e1000e-objs := 82571.o ich8lan.o es2lan.o \
+e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
               lib.o phy.o param.o ethtool.o netdev.o
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index c516a7440bec..c516a7440bec 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 638d175792cf..638d175792cf 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 06d88f316dce..06d88f316dce 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index 29670397079b..29670397079b 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 4e36978b8fd8..4e36978b8fd8 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
index 7898a67d6505..7898a67d6505 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/lib.c
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ab4be80f7ab5..ab4be80f7ab5 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
diff --git a/drivers/net/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 4dd9b63273f6..4dd9b63273f6 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 8666476cb9be..8666476cb9be 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
diff --git a/drivers/net/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
index c6e4621b6262..c6e4621b6262 100644
--- a/drivers/net/igb/Makefile
+++ b/drivers/net/ethernet/intel/igb/Makefile
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index c0857bdfb03a..c0857bdfb03a 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
index 786e110011a3..786e110011a3 100644
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index 7b8ddd830f19..7b8ddd830f19 100644
--- a/drivers/net/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 4519a1367170..4519a1367170 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index 2b5ef761d2ab..2b5ef761d2ab 100644
--- a/drivers/net/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h
index 4927f61fbbc8..4927f61fbbc8 100644
--- a/drivers/net/igb/e1000_mac.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.h
diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
index 74f2f11ac290..74f2f11ac290 100644
--- a/drivers/net/igb/e1000_mbx.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.c
diff --git a/drivers/net/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h
index eddb0f83dcea..eddb0f83dcea 100644
--- a/drivers/net/igb/e1000_mbx.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.h
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
index 40407124e722..40407124e722 100644
--- a/drivers/net/igb/e1000_nvm.c
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c
diff --git a/drivers/net/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h
index a2a7ca9fa733..a2a7ca9fa733 100644
--- a/drivers/net/igb/e1000_nvm.h
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.h
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index e662554c62d6..e662554c62d6 100644
--- a/drivers/net/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
index 8510797b9d81..8510797b9d81 100644
--- a/drivers/net/igb/e1000_phy.h
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.h
diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 0990f6d860c7..0990f6d860c7 100644
--- a/drivers/net/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
diff --git a/drivers/net/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 265e151b66c4..265e151b66c4 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 414b0225be89..414b0225be89 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 40d4c405fd7e..40d4c405fd7e 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
diff --git a/drivers/net/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
index 0fa3db3dd8b6..0fa3db3dd8b6 100644
--- a/drivers/net/igbvf/Makefile
+++ b/drivers/net/ethernet/intel/igbvf/Makefile
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
index 79f2604673fe..79f2604673fe 100644
--- a/drivers/net/igbvf/defines.h
+++ b/drivers/net/ethernet/intel/igbvf/defines.h
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index b0b14d63dfbf..b0b14d63dfbf 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
index fd4a7b780fdd..fd4a7b780fdd 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h
diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
index 3d6f4cc3998a..3d6f4cc3998a 100644
--- a/drivers/net/igbvf/mbx.c
+++ b/drivers/net/ethernet/intel/igbvf/mbx.c
diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h
index c2883c45d477..c2883c45d477 100644
--- a/drivers/net/igbvf/mbx.h
+++ b/drivers/net/ethernet/intel/igbvf/mbx.h
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 40ed066e3ef4..40ed066e3ef4 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
diff --git a/drivers/net/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h
index 77e18d3d6b15..77e18d3d6b15 100644
--- a/drivers/net/igbvf/regs.h
+++ b/drivers/net/ethernet/intel/igbvf/regs.h
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
index af3822f9ea9a..af3822f9ea9a 100644
--- a/drivers/net/igbvf/vf.c
+++ b/drivers/net/ethernet/intel/igbvf/vf.c
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
index d7ed58fcd9bb..d7ed58fcd9bb 100644
--- a/drivers/net/igbvf/vf.h
+++ b/drivers/net/ethernet/intel/igbvf/vf.h
diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile
index 0b20c5e62ffe..0b20c5e62ffe 100644
--- a/drivers/net/ixgb/Makefile
+++ b/drivers/net/ethernet/intel/ixgb/Makefile
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
index 49e8408f05fc..49e8408f05fc 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb.h
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c
index 38b362b67857..38b362b67857 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h
index 7ea12652f471..7ea12652f471 100644
--- a/drivers/net/ixgb/ixgb_ee.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
index 6da890b9534c..6da890b9534c 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
index 3d61a9e4faf7..3d61a9e4faf7 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h
index 873d32b89fba..873d32b89fba 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
index 2a58847f46e8..2a58847f46e8 100644
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 6a130eb51cfa..6a130eb51cfa 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
index e361185920ef..e361185920ef 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c
index dd7fbeb1f7d1..dd7fbeb1f7d1 100644
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_param.c
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 7d7387fbdecd..7d7387fbdecd 100644
--- a/drivers/net/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index e04a8e49e6dc..e04a8e49e6dc 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index 0d4e38264492..0d4e38264492 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 34f30ec79c2e..34f30ec79c2e 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index fc1375f26fe5..fc1375f26fe5 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
index f24fd64a4c46..f24fd64a4c46 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
index 9d88c31487bc..9d88c31487bc 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
index e85826ae0320..e85826ae0320 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
index 2288c3cac010..2288c3cac010 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
index 2f318935561a..2f318935561a 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
index ade98200288c..ade98200288c 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
index 08d1749862a3..08d1749862a3 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 0ace6ce1d0b4..0ace6ce1d0b4 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 82d4244c6e10..82d4244c6e10 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index 824edae77865..824edae77865 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
index 99de145e290d..99de145e290d 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e86297b32733..e86297b32733 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
index 1ff0eefcfd0a..1ff0eefcfd0a 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
index b239bdac38da..b239bdac38da 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index f7ca3511b9fe..f7ca3511b9fe 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
index 197bdd13106a..197bdd13106a 100644
--- a/drivers/net/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index d99d01e21326..d99d01e21326 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 34175564bb78..34175564bb78 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index e0d970ebab7a..e0d970ebab7a 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 2696c78e9f46..2696c78e9f46 100644
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
diff --git a/drivers/net/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
index 1f35d229e71a..1f35d229e71a 100644
--- a/drivers/net/ixgbevf/Makefile
+++ b/drivers/net/ethernet/intel/ixgbevf/Makefile
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
index 78abb6f1a866..78abb6f1a866 100644
--- a/drivers/net/ixgbevf/defines.h
+++ b/drivers/net/ethernet/intel/ixgbevf/defines.h
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index deee3754b1f7..deee3754b1f7 100644
--- a/drivers/net/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 8857df4dd3b9..8857df4dd3b9 100644
--- a/drivers/net/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 3b880a27f8d1..3b880a27f8d1 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
diff --git a/drivers/net/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
index 7a8833125770..7a8833125770 100644
--- a/drivers/net/ixgbevf/mbx.c
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.c
diff --git a/drivers/net/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h
index ea393eb03f3a..ea393eb03f3a 100644
--- a/drivers/net/ixgbevf/mbx.h
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h
diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
index 189200eeca26..189200eeca26 100644
--- a/drivers/net/ixgbevf/regs.h
+++ b/drivers/net/ethernet/intel/ixgbevf/regs.h
diff --git a/drivers/net/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index aa3682e8c473..aa3682e8c473 100644
--- a/drivers/net/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 10306b492ee6..10306b492ee6 100644
--- a/drivers/net/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
new file mode 100644
index 000000000000..a7c4424011ec
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -0,0 +1,53 @@
+#
+# QLogic network device configuration
+#
+config NET_VENDOR_QLOGIC
+        bool "QLogic devices"
+        depends on PCI
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about QLogic cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_QLOGIC
+config QLA3XXX
+        tristate "QLogic QLA3XXX Network Driver Support"
+        depends on PCI
+        ---help---
+          This driver supports QLogic ISP3XXX gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called qla3xxx.
+config QLCNIC
+        tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
+        depends on PCI
+        select FW_LOADER
+        ---help---
+          This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
+          devices.
+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.
+config NETXEN_NIC
+        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+        depends on PCI
+        select FW_LOADER
+        ---help---
+          This enables the support for NetXen's Gigabit Ethernet card.
+endif # NET_VENDOR_QLOGIC
diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile
new file mode 100644
index 000000000000..b2a283d9ae60
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the QLogic network device drivers.
+#
+obj-$(CONFIG_QLA3XXX) += qla3xxx.o
+obj-$(CONFIG_QLCNIC) += qlcnic/
+obj-$(CONFIG_QLGE) += qlge/
+obj-$(CONFIG_NETXEN_NIC) += netxen/
diff --git a/drivers/net/netxen/Makefile b/drivers/net/ethernet/qlogic/netxen/Makefile
index 861a0590b1f4..861a0590b1f4 100644
--- a/drivers/net/netxen/Makefile
+++ b/drivers/net/ethernet/qlogic/netxen/Makefile
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index 196b660e1d91..196b660e1d91 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index a925392abd6f..a925392abd6f 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index b34fb74d07e3..b34fb74d07e3 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index dc1967c1f312..dc1967c1f312 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index 3f89e57cae50..3f89e57cae50 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h
index e2c5b6f2df03..e2c5b6f2df03 100644
--- a/drivers/net/netxen/netxen_nic_hw.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index d6c6357de6aa..d6c6357de6aa 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 8c7fc32d781f..8c7fc32d781f 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
diff --git a/drivers/net/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index ccde8061afa8..ccde8061afa8 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
diff --git a/drivers/net/qla3xxx.h b/drivers/net/ethernet/qlogic/qla3xxx.h
index 73e234366a82..73e234366a82 100644
--- a/drivers/net/qla3xxx.h
+++ b/drivers/net/ethernet/qlogic/qla3xxx.h
diff --git a/drivers/net/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile
index ddba83ef3f44..ddba83ef3f44 100644
--- a/drivers/net/qlcnic/Makefile
+++ b/drivers/net/ethernet/qlogic/qlcnic/Makefile
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 53c6e5dcf26c..53c6e5dcf26c 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index b0d32ddd2ccb..b0d32ddd2ccb 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 7c64f2ffc219..7c64f2ffc219 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index d14506f764e0..d14506f764e0 100644
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 74e9d7b94965..74e9d7b94965 100644
--- a/drivers/net/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 3b6741e4754d..3b6741e4754d 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index ec8ef72d38d3..ec8ef72d38d3 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
diff --git a/drivers/net/qlge/Makefile b/drivers/net/ethernet/qlogic/qlge/Makefile
index 8a197658d76f..8a197658d76f 100644
--- a/drivers/net/qlge/Makefile
+++ b/drivers/net/ethernet/qlogic/qlge/Makefile
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index 8731f79c9efc..8731f79c9efc 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index fca804f36d61..fca804f36d61 100644
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 9b67bfea035f..9b67bfea035f 100644
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index f07e96ec8843..f07e96ec8843 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index ff2bf8a4e247..ff2bf8a4e247 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
new file mode 100644
index 000000000000..702efe686c48
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -0,0 +1,131 @@
+#
+# Western Digital/SMC network device configuration
+#
+config NET_VENDOR_SMSC
+        bool "SMC (SMSC)/Western Digital devices"
+        depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
+                BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about SMC/Western Digital cards. If you say Y, you will
+          be asked for your specific card in the following questions.
+if NET_VENDOR_SMSC
+config SMC9194
+        tristate "SMC 9194 support"
+        depends on (ISA || MAC && BROKEN)
+        select CRC32
+        ---help---
+          This is support for the SMC9xxx based Ethernet cards. Choose this
+          option if you have a DELL laptop with the docking station, or
+          another SMC9192/9194 based chipset.  Say Y if you want it compiled
+          into the kernel, and read the file
+          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. The module
+          will be called smc9194.
+config SMC91X
+        tristate "SMC 91C9x/91C1xxx support"
+        select CRC32
+        select MII
+        depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
+                    MN10300 || COLDFIRE)
+        ---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
+          compiled into the kernel, and read the file
+          <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
+          available from  <http://www.tldp.org/docs.html#howto>.
+          This driver is also available as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called smc91x.  If you want to compile it as a
+          module, say M here and read <file:Documentation/kbuild/modules.txt>.
+config PCMCIA_SMC91C92
+        tristate "SMC 91Cxx PCMCIA support"
+        depends on PCMCIA
+        select CRC32
+        select MII
+        ---help---
+          Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
+          (PC-card) Ethernet or Fast Ethernet card to your computer.
+          To compile this driver as a module, choose M here: the module will be
+          called smc91c92_cs.  If unsure, say N.
+config EPIC100
+        tristate "SMC EtherPower II"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
+          which is based on the SMC83c17x (EPIC/100).
+          More specific information and updates are available from
+          <http://www.scyld.com/network/epic100.html>.
+config SMC911X
+        tristate "SMSC LAN911[5678] support"
+        select CRC32
+        select MII
+        depends on (ARM || SUPERH || MN10300)
+        ---help---
+          This is a driver for SMSC's LAN911x series of Ethernet chipsets
+          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
+          Say Y if you want it compiled into the kernel,
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          This driver is also available as a module. The module will be
+          called smc911x.  If you want to compile it as a module, say M
+          here and read <file:Documentation/kbuild/modules.txt>
+config SMSC911X
+        tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
+        depends on (ARM || SUPERH || BLACKFIN || MIPS || MN10300)
+        select CRC32
+        select MII
+        select PHYLIB
+        ---help---
+          Say Y here if you want support for SMSC LAN911x and LAN921x families
+          of ethernet controllers.
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/networking/net-modules.txt>. The module
+          will be called smsc911x.
+config SMSC911X_ARCH_HOOKS
+        def_bool n
+        depends on SMSC911X
+        ---help---
+          If the arch enables this, it allows the arch to implement various
+          hooks for more comprehensive interrupt control and also to override
+          the source of the MAC address.
+config SMSC9420
+        tristate "SMSC LAN9420 PCI ethernet adapter support"
+        depends on 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.tldp.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>
+endif # NET_VENDOR_SMSC
diff --git a/drivers/net/ethernet/smsc/Makefile b/drivers/net/ethernet/smsc/Makefile
new file mode 100644
index 000000000000..f3438dec9d90
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the SMSC network device drivers.
+#
+obj-$(CONFIG_SMC9194) += smc9194.o
+obj-$(CONFIG_SMC91X) += smc91x.o
+obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o
+obj-$(CONFIG_EPIC100) += epic100.o
+obj-$(CONFIG_SMSC9420) += smsc9420.o
+obj-$(CONFIG_SMC911X) += smc911x.o
+obj-$(CONFIG_SMSC911X) += smsc911x.o
diff --git a/drivers/net/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 814c187d5f95..814c187d5f95 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
diff --git a/drivers/net/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index a91fe1723020..a91fe1723020 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
diff --git a/drivers/net/smc911x.h b/drivers/net/ethernet/smsc/smc911x.h
index 3269292efecc..3269292efecc 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/ethernet/smsc/smc911x.h
diff --git a/drivers/net/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c
index 5b65ac4b3cef..5b65ac4b3cef 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/ethernet/smsc/smc9194.c
diff --git a/drivers/net/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h
index cf69d0a5a1cb..cf69d0a5a1cb 100644
--- a/drivers/net/smc9194.h
+++ b/drivers/net/ethernet/smsc/smc9194.h
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index cffbc0373fa9..cffbc0373fa9 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
diff --git a/drivers/net/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 2b1d254d59af..2b1d254d59af 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
diff --git a/drivers/net/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 5f53fbbf67be..5f53fbbf67be 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
diff --git a/drivers/net/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 75c08a55582c..75c08a55582c 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
diff --git a/drivers/net/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
index 8d67aacf8867..8d67aacf8867 100644
--- a/drivers/net/smsc911x.h
+++ b/drivers/net/ethernet/smsc/smsc911x.h
diff --git a/drivers/net/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index 459726f54754..459726f54754 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
diff --git a/drivers/net/smsc9420.h b/drivers/net/ethernet/smsc/smsc9420.h
index e441402f77a2..e441402f77a2 100644
--- a/drivers/net/smsc9420.h
+++ b/drivers/net/ethernet/smsc/smsc9420.h
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 9b8f793b1cc8..f5a738ff59f5 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -21,24 +21,6 @@ menuconfig NET_PCMCIA
 if NET_PCMCIA && PCMCIA
-config PCMCIA_3C589
-        tristate "3Com 3c589 PCMCIA support"
-        help
-          Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
-          (PC-card) Ethernet card to your computer.
-          To compile this driver as a module, choose M here: the module will be
-          called 3c589_cs.  If unsure, say N.
-config PCMCIA_3C574
-        tristate "3Com 3c574 PCMCIA support"
-        help
-          Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
-          (PC-card) Fast Ethernet card to your computer.
-          To compile this driver as a module, choose M here: the module will be
-          called 3c574_cs.  If unsure, say N.
 config PCMCIA_FMVJ18X
        tristate "Fujitsu FMV-J18x PCMCIA support"
        select CRC32
@@ -49,36 +31,6 @@ config PCMCIA_FMVJ18X
          To compile this driver as a module, choose M here: the module will be
          called fmvj18x_cs.  If unsure, say N.
-config PCMCIA_PCNET
-        tristate "NE2000 compatible PCMCIA support"
-        select CRC32
-        help
-          Say Y here if you intend to attach an NE2000 compatible PCMCIA
-          (PC-card) Ethernet or Fast Ethernet card to your computer.
-          To compile this driver as a module, choose M here: the module will be
-          called pcnet_cs.  If unsure, say N.
-config PCMCIA_NMCLAN
-        tristate "New Media PCMCIA support"
-        help
-          Say Y here if you intend to attach a New Media Ethernet or LiveWire
-          PCMCIA (PC-card) Ethernet card to your computer.
-          To compile this driver as a module, choose M here: the module will be
-          called nmclan_cs.  If unsure, say N.
-config PCMCIA_SMC91C92
-        tristate "SMC 91Cxx PCMCIA support"
-        select CRC32
-        select MII
-        help
-          Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
-          (PC-card) Ethernet or Fast Ethernet card to your computer.
-          To compile this driver as a module, choose M here: the module will be
-          called smc91c92_cs.  If unsure, say N.
 config PCMCIA_XIRC2PS
        tristate "Xircom 16-bit PCMCIA support"
        help
@@ -88,17 +40,6 @@ config PCMCIA_XIRC2PS
          To compile this driver as a module, choose M here: the module will be
          called xirc2ps_cs.  If unsure, say N.
-config PCMCIA_AXNET
-        tristate "Asix AX88190 PCMCIA support"
-        ---help---
-          Say Y here if you intend to attach an Asix AX88190-based PCMCIA
-          (PC-card) Fast Ethernet card to your computer.  These cards are
-          nearly NE2000 compatible but need a separate driver due to a few
-          misfeatures.
-          To compile this driver as a module, choose M here: the module will be
-          called axnet_cs.  If unsure, say N.
 config ARCNET_COM20020_CS
        tristate "COM20020 ARCnet PCMCIA support"
        depends on ARCNET_COM20020
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 87d2d99f4c14..f9c98836d75b 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -3,14 +3,8 @@
 #
 # 16-bit client drivers
-obj-$(CONFIG_PCMCIA_3C589)      += 3c589_cs.o
-obj-$(CONFIG_PCMCIA_3C574)      += 3c574_cs.o
 obj-$(CONFIG_PCMCIA_FMVJ18X)    += fmvj18x_cs.o
-obj-$(CONFIG_PCMCIA_NMCLAN)     += nmclan_cs.o
-obj-$(CONFIG_PCMCIA_PCNET)      += pcnet_cs.o
-obj-$(CONFIG_PCMCIA_SMC91C92)   += smc91c92_cs.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)    += xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-obj-$(CONFIG_PCMCIA_AXNET)      += axnet_cs.o
 obj-$(CONFIG_PCMCIA_IBMTR)      += ibmtr_cs.o
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 42228ca5a9d2..5613e8afffb0 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -58,7 +58,7 @@
 #include "57xx_hsi_bnx2fc.h"
 #include "bnx2fc_debug.h"
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "bnx2fc_constants.h"
 #define BNX2FC_NAME             "bnx2fc"
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index dc5700765db4..0bd70e80efe4 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -40,7 +40,7 @@
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "57xx_iscsi_hsi.h"
 #include "57xx_iscsi_constants.h"
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild
index 09dbf9efc8ea..6f095e28a974 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb3i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kbuild b/drivers/scsi/cxgbi/cxgb4i/Kbuild
index b9f4af7454b7..8290cdaa4652 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb4i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb4
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o
author	David S. Miller <davem@davemloft.net>	2011-08-11 01:05:54 -0400
committer	David S. Miller <davem@davemloft.net>	2011-08-11 01:05:54 -0400
commit	628a604842b68cb0fc483e7cd5fcfb836be633d5 (patch)
tree	686b7f3eb491a9626c72b449e34baa3df3c303a9
parent	9de79c127cccecb11ae6a21ab1499e87aa222880 (diff)
parent	115978859272b958366d4a08c99a24f9625fa663 (diff)