* [net-next v2 01/71] drivers/net/ethernet: Add ethernet dir and config option
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
This is the initial patch to organize the drivers/net directory
structure and networking device driver config options. This patch
does the following:
- add drivers/net/ethernet/Kconfig
- integrate the new files into the existing config
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 2 ++
drivers/net/Makefile | 2 +-
drivers/net/ethernet/Kconfig | 14 ++++++++++++++
drivers/net/ethernet/Makefile | 3 +++
4 files changed, 20 insertions(+), 1 deletions(-)
create mode 100644 drivers/net/ethernet/Kconfig
create mode 100644 drivers/net/ethernet/Makefile
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8d0314d..5b95796 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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e1eca2a..670b514 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
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
new file mode 100644
index 0000000..d59e4f2
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig
@@ -0,0 +1,14 @@
+#
+# 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
+
+endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
new file mode 100644
index 0000000..0d21dda
--- /dev/null
+++ b/drivers/net/ethernet/Makefile
@@ -0,0 +1,3 @@
+#
+# Makefile for the Linux network Ethernet device drivers.
+#
--
1.7.6
^ permalink raw reply related
* [RFC net-next v2 00/71] Organize/Move of the Ethernet drivers in drivers/net/
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
Ok, in preparation for David Miller opening up his net-next tree (3.2),
I am sending out the second round of RFC patches. This series
includes most (if not all) the suggested changes from the first round
of RFC patches.
v2: Here is a list of most of the changes
- Moved ixp* drivers into drivers/net/ethernet/xscale
- Moved the 825xx based drivers into drivers/net/ethernet/i825xx
- Moved the Blackfin driver into drivers/net/ethernet/adi
- Moved the MACB driver into drivers/net/ethernet/cadence
- Moved the davinci driver into drivers/net/ethernet/ti
- Changed drivers/net/ethernet/oki to drivers/net/ethernet/oki-semi
- Removed the "new" from the IBM emac driver name
- Move the Tilera driver (tile) into drivers/net/ethernet/tile
- Created a dec folder for Digital Equipment based drivers
- Move the Xircom driver into drivers/net/ethernet/xircom
For those who missed the first round, here is a second chance to speak
up before I submit this for inclusion upon net-next window opening
up.
The following series is an attempt to organize the drivers/net
directory. This process was started a year ago, and the emphasis
was on making drivers/net/ easier to maintain, have tab-completion
actually work and to group similar drivers into the appropriate
sub-directory.
The next steps are to organize the FDDI drivers into drivers/net/fddi,
and like so.
NOTE: I made these patches against David Miller's net tree, since he
will be merging his net tree with net-next when he opens his net-next
tree.
The following are changes since commit 384b90abeba71579e0601ff434e3ea40c15057f0:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
and are available in the git repository at:
git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-organize master
Jeff Kirsher (71):
drivers/net/ethernet: Add ethernet dir and config option
3c*/acenic/typhoon: Move 3Com Ethernet drivers
amd: Move AMD (Lance) chipset drivers
8390: Move the 8390 related drivers
broadcom: Move the Broadcom drivers
chelsio: Move the Chelsio drivers
intel: Move the Intel wired LAN drivers
qlogic: Move the QLogic drivers
smsc: Move the SMC (SMSC) drivers
i825xx: Move the Intel 82586/82593/82596 based drivers
ni5010: Move the Racal-Interlan (Micom) driver
cassini/niu/sun*: Move the Sun drivers
sfc: Move the Solarflare drivers
be2net: Move the Emulex driver
bna: Move the Brocade driver
mlx4: Move the Mellanox driver
myri*: Move the Myricom drivers
s2io/vxge: Move the Exar drivers
ehea/ibm*: Move the IBM drivers
enic: Move the Cisco driver
pasemic_mac*: Move the PA Semi driver
tehuti: Move the Tehuti driver
stmmac: Move the STMicroelectronics driver
bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
*sonic/natsemi/ns83829: Move the National Semi-conductor drivers
xscale: Move the Intel XScale IXP drivers
ftgmac100/ftmac100: Move the Faraday drivers
8139*/atp/r8169/sc92031: Move the Realtek drivers
de6*/dl2k/sundance: Move the D-Link drivers
atl*: Move the Atheros drivers
ewrk3/tulip: Move the DEC - Tulip drivers
ioc3-eth/meth: Move the SGI drivers
seeq: Move the SEEQ drivers
pch_gbe: Move the OKI Semiconductor driver
skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers
via-*: Move the VIA drivers
eth16i: Move the Allied Telesis/Fujitsu drivers
freescale: Move the Freescale drivers
ks8*/ksz8*: Move the Micrel drivers
toshiba: Move the Toshiba drivers
sis*: Move the Silicon Integrated Systems (SiS) drivers
cirrus: Move the Cirrus network driver
nuvoton: Move the Nuvoton driver
tsi108*: Move the Tundra driver
s6gmac: Move the s6gmac drivers
davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers
hamachi/yellowfin: Move the packet engine drivers
octeon: Move the Cavium driver
jme: Move the JME driver
xilinx/ll_temac: Move the Xilinx drivers
ipg: Move the IC Plus driver
korina: Move the IDT driver
mipsnet: Move the MIPS driver
lantiq: Move the Lantiq SoC driver
bfin_mac: Move the Analog Devices Inc driver
macb: Move the Atmel driver
r6040: Move the RDC driver
fealnx: Move the Myson driver
forcedeth: Move the NVIDIA nForce driver
starfire: Move the Adaptec driver
hp100: Move the HP driver
dnet: Move the Dave Ethernet driver
ethoc: Move the Avionic driver
greth: Move the Aeroflex Gaisler driver
enc28j60: Move the Microchip driver
dm9000: Move the Davicom driver
netx: Move the netx driver
sh_eth: Move the Renesas SuperH driver
xircom: Move the Xircom driver
tile: Move the Tilera driver
drivers/net: Kconfig and Makefile cleanup
MAINTAINERS | 154 +-
drivers/infiniband/hw/cxgb3/Makefile | 2 +-
drivers/infiniband/hw/cxgb4/Makefile | 2 +-
drivers/net/Kconfig | 2826 +-------------------
drivers/net/Makefile | 235 +--
drivers/net/arm/Kconfig | 74 -
drivers/net/arm/Makefile | 14 -
drivers/net/benet/Kconfig | 6 -
drivers/net/{ => ethernet/3com}/3c501.c | 0
drivers/net/{ => ethernet/3com}/3c501.h | 0
drivers/net/{ => ethernet/3com}/3c509.c | 0
drivers/net/{ => ethernet/3com}/3c515.c | 0
drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 0
drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 0
drivers/net/{ => ethernet/3com}/3c59x.c | 0
drivers/net/ethernet/3com/Kconfig | 143 +
drivers/net/ethernet/3com/Makefile | 12 +
drivers/net/{ => ethernet/3com}/acenic.c | 0
drivers/net/{ => ethernet/3com}/acenic.h | 0
drivers/net/{ => ethernet/3com}/typhoon.c | 0
drivers/net/{ => ethernet/3com}/typhoon.h | 0
drivers/net/{ => ethernet/8390}/3c503.c | 0
drivers/net/{ => ethernet/8390}/3c503.h | 0
drivers/net/{ => ethernet/8390}/8390.c | 0
drivers/net/{ => ethernet/8390}/8390.h | 0
drivers/net/{ => ethernet/8390}/8390p.c | 0
drivers/net/ethernet/8390/Kconfig | 332 +++
drivers/net/ethernet/8390/Makefile | 29 +
drivers/net/{ => ethernet/8390}/ac3200.c | 0
drivers/net/{ => ethernet/8390}/apne.c | 0
drivers/net/{ => ethernet/8390}/ax88796.c | 0
drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 2 +-
drivers/net/{ => ethernet/8390}/e2100.c | 0
drivers/net/{ => ethernet/8390}/es3210.c | 0
drivers/net/{arm => ethernet/8390}/etherh.c | 2 +-
drivers/net/{ => ethernet/8390}/hp-plus.c | 0
drivers/net/{ => ethernet/8390}/hp.c | 0
drivers/net/{ => ethernet/8390}/hydra.c | 0
drivers/net/{ => ethernet/8390}/lib8390.c | 0
drivers/net/{ => ethernet/8390}/lne390.c | 0
drivers/net/{ => ethernet/8390}/mac8390.c | 0
drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
drivers/net/{ => ethernet/8390}/ne.c | 0
drivers/net/{ => ethernet/8390}/ne2.c | 0
drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
drivers/net/{ => ethernet/8390}/ne3210.c | 0
drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 2 +-
drivers/net/{ => ethernet/8390}/smc-mca.c | 0
drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
drivers/net/{ => ethernet/8390}/stnic.c | 0
drivers/net/{ => ethernet/8390}/wd.c | 0
drivers/net/{ => ethernet/8390}/zorro8390.c | 0
drivers/net/ethernet/Kconfig | 169 ++
drivers/net/ethernet/Makefile | 73 +
drivers/net/ethernet/adaptec/Kconfig | 30 +
drivers/net/ethernet/adaptec/Makefile | 5 +
drivers/net/{ => ethernet/adaptec}/starfire.c | 0
drivers/net/ethernet/adi/Kconfig | 65 +
drivers/net/ethernet/adi/Makefile | 5 +
drivers/net/{ => ethernet/adi}/bfin_mac.c | 0
drivers/net/{ => ethernet/adi}/bfin_mac.h | 0
drivers/net/ethernet/aeroflex/Kconfig | 11 +
drivers/net/ethernet/aeroflex/Makefile | 5 +
drivers/net/{ => ethernet/aeroflex}/greth.c | 0
drivers/net/{ => ethernet/aeroflex}/greth.h | 0
drivers/net/{ => ethernet/amd}/7990.c | 0
drivers/net/{ => ethernet/amd}/7990.h | 0
drivers/net/ethernet/amd/Kconfig | 188 ++
drivers/net/ethernet/amd/Makefile | 20 +
drivers/net/{ => ethernet/amd}/a2065.c | 0
drivers/net/{ => ethernet/amd}/a2065.h | 0
drivers/net/{arm => ethernet/amd}/am79c961a.c | 0
drivers/net/{arm => ethernet/amd}/am79c961a.h | 0
drivers/net/{ => ethernet/amd}/amd8111e.c | 0
drivers/net/{ => ethernet/amd}/amd8111e.h | 0
drivers/net/{ => ethernet/amd}/ariadne.c | 0
drivers/net/{ => ethernet/amd}/ariadne.h | 0
drivers/net/{ => ethernet/amd}/atarilance.c | 0
drivers/net/{ => ethernet/amd}/au1000_eth.c | 0
drivers/net/{ => ethernet/amd}/au1000_eth.h | 0
drivers/net/{ => ethernet/amd}/declance.c | 0
drivers/net/{ => ethernet/amd}/depca.c | 0
drivers/net/{ => ethernet/amd}/depca.h | 0
drivers/net/{ => ethernet/amd}/hplance.c | 0
drivers/net/{ => ethernet/amd}/hplance.h | 0
drivers/net/{ => ethernet/amd}/lance.c | 0
drivers/net/{ => ethernet/amd}/mvme147.c | 0
drivers/net/{ => ethernet/amd}/ni65.c | 0
drivers/net/{ => ethernet/amd}/ni65.h | 0
drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 0
drivers/net/{ => ethernet/amd}/pcnet32.c | 0
drivers/net/{ => ethernet/amd}/sun3lance.c | 0
drivers/net/{ => ethernet/amd}/sunlance.c | 0
drivers/net/ethernet/apple/Kconfig | 92 +
drivers/net/ethernet/apple/Makefile | 9 +
drivers/net/{ => ethernet/apple}/bmac.c | 0
drivers/net/{ => ethernet/apple}/bmac.h | 0
drivers/net/{ => ethernet/apple}/cs89x0.c | 0
drivers/net/{ => ethernet/apple}/cs89x0.h | 0
drivers/net/{ => ethernet/apple}/mac89x0.c | 0
drivers/net/{ => ethernet/apple}/mace.c | 0
drivers/net/{ => ethernet/apple}/mace.h | 0
drivers/net/{ => ethernet/apple}/macmace.c | 0
drivers/net/ethernet/atheros/Kconfig | 61 +
drivers/net/ethernet/atheros/Makefile | 8 +
drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
.../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
.../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
drivers/net/ethernet/broadcom/Kconfig | 114 +
drivers/net/ethernet/broadcom/Makefile | 11 +
drivers/net/{ => ethernet/broadcom}/b44.c | 0
drivers/net/{ => ethernet/broadcom}/b44.h | 0
drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
.../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
drivers/net/{ => ethernet/broadcom}/cnic.h | 0
drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
drivers/net/{ => ethernet/broadcom}/tg3.c | 0
drivers/net/{ => ethernet/broadcom}/tg3.h | 0
drivers/net/ethernet/brocade/Kconfig | 18 +
drivers/net/ethernet/brocade/Makefile | 5 +
drivers/net/ethernet/brocade/bna/Kconfig | 17 +
drivers/net/{ => ethernet/brocade}/bna/Makefile | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfi.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_hw.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.c | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.h | 0
.../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 0
drivers/net/{ => ethernet/brocade}/bna/cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0
drivers/net/ethernet/cadence/Kconfig | 40 +
drivers/net/ethernet/cadence/Makefile | 6 +
drivers/net/{arm => ethernet/cadence}/at91_ether.c | 0
drivers/net/{arm => ethernet/cadence}/at91_ether.h | 0
drivers/net/{ => ethernet/cadence}/macb.c | 0
drivers/net/{ => ethernet/cadence}/macb.h | 0
drivers/net/ethernet/chelsio/Kconfig | 102 +
drivers/net/ethernet/chelsio/Makefile | 8 +
.../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
.../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
.../chelsio/cxgb}/suni1x10gexp_regs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
.../chelsio/cxgb}/vsc7326_reg.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
.../chelsio}/cxgb3/firmware_exports.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
.../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
.../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
.../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
.../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
.../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
.../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
drivers/net/ethernet/cirrus/Kconfig | 24 +
drivers/net/ethernet/cirrus/Makefile | 5 +
drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0
drivers/net/ethernet/cisco/Kconfig | 18 +
drivers/net/ethernet/cisco/Makefile | 5 +
drivers/net/ethernet/cisco/enic/Kconfig | 9 +
drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
.../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
.../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
.../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
drivers/net/ethernet/davicom/Kconfig | 31 +
drivers/net/ethernet/davicom/Makefile | 5 +
drivers/net/{ => ethernet/davicom}/dm9000.c | 0
drivers/net/{ => ethernet/davicom}/dm9000.h | 0
drivers/net/ethernet/dec/Kconfig | 30 +
drivers/net/ethernet/dec/Makefile | 6 +
drivers/net/{ => ethernet/dec}/ewrk3.c | 0
drivers/net/{ => ethernet/dec}/ewrk3.h | 0
drivers/net/{ => ethernet/dec}/tulip/21142.c | 0
drivers/net/{ => ethernet/dec}/tulip/Kconfig | 36 +-
drivers/net/{ => ethernet/dec}/tulip/Makefile | 0
drivers/net/{ => ethernet/dec}/tulip/de2104x.c | 0
drivers/net/{ => ethernet/dec}/tulip/de4x5.c | 0
drivers/net/{ => ethernet/dec}/tulip/de4x5.h | 0
drivers/net/{ => ethernet/dec}/tulip/dmfe.c | 0
drivers/net/{ => ethernet/dec}/tulip/eeprom.c | 0
drivers/net/{ => ethernet/dec}/tulip/interrupt.c | 0
drivers/net/{ => ethernet/dec}/tulip/media.c | 0
drivers/net/{ => ethernet/dec}/tulip/pnic.c | 0
drivers/net/{ => ethernet/dec}/tulip/pnic2.c | 0
drivers/net/{ => ethernet/dec}/tulip/timer.c | 0
drivers/net/{ => ethernet/dec}/tulip/tulip.h | 0
drivers/net/{ => ethernet/dec}/tulip/tulip_core.c | 0
drivers/net/{ => ethernet/dec}/tulip/uli526x.c | 0
drivers/net/{ => ethernet/dec}/tulip/winbond-840.c | 0
drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c | 0
drivers/net/ethernet/dlink/Kconfig | 80 +
drivers/net/ethernet/dlink/Makefile | 8 +
drivers/net/{ => ethernet/dlink}/de600.c | 0
drivers/net/{ => ethernet/dlink}/de600.h | 0
drivers/net/{ => ethernet/dlink}/de620.c | 0
drivers/net/{ => ethernet/dlink}/de620.h | 0
drivers/net/{ => ethernet/dlink}/dl2k.c | 0
drivers/net/{ => ethernet/dlink}/dl2k.h | 0
drivers/net/{ => ethernet/dlink}/sundance.c | 0
drivers/net/{ => ethernet}/dnet.c | 0
drivers/net/{ => ethernet}/dnet.h | 0
drivers/net/ethernet/emulex/Kconfig | 18 +
drivers/net/ethernet/emulex/Makefile | 5 +
drivers/net/ethernet/emulex/benet/Kconfig | 6 +
drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
drivers/net/{ => ethernet/emulex}/benet/be.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 0
.../net/{ => ethernet/emulex}/benet/be_ethtool.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_main.c | 0
drivers/net/{ => ethernet}/ethoc.c | 0
drivers/net/ethernet/faraday/Kconfig | 34 +
drivers/net/ethernet/faraday/Makefile | 6 +
drivers/net/{ => ethernet/faraday}/ftgmac100.c | 0
drivers/net/{ => ethernet/faraday}/ftgmac100.h | 0
drivers/net/{ => ethernet/faraday}/ftmac100.c | 0
drivers/net/{ => ethernet/faraday}/ftmac100.h | 0
drivers/net/{ => ethernet}/fealnx.c | 0
drivers/net/ethernet/freescale/Kconfig | 85 +
drivers/net/ethernet/freescale/Makefile | 18 +
drivers/net/{ => ethernet/freescale}/fec.c | 0
drivers/net/{ => ethernet/freescale}/fec.h | 0
drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c | 0
drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h | 0
.../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c | 0
.../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
.../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
.../freescale}/fs_enet/fs_enet-main.c | 0
.../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
.../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
drivers/net/{ => ethernet/freescale}/gianfar.c | 0
drivers/net/{ => ethernet/freescale}/gianfar.h | 0
.../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
.../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
.../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
drivers/net/ethernet/fujitsu/Kconfig | 49 +
drivers/net/ethernet/fujitsu/Makefile | 7 +
drivers/net/{ => ethernet/fujitsu}/at1700.c | 0
drivers/net/{ => ethernet/fujitsu}/eth16i.c | 0
.../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c | 0
drivers/net/ethernet/hp/Kconfig | 27 +
drivers/net/ethernet/hp/Makefile | 5 +
drivers/net/{ => ethernet/hp}/hp100.c | 0
drivers/net/{ => ethernet/hp}/hp100.h | 0
drivers/net/{ => ethernet/i825xx}/3c505.c | 0
drivers/net/{ => ethernet/i825xx}/3c505.h | 0
drivers/net/{ => ethernet/i825xx}/3c507.c | 0
drivers/net/{ => ethernet/i825xx}/3c523.c | 0
drivers/net/{ => ethernet/i825xx}/3c523.h | 0
drivers/net/{ => ethernet/i825xx}/3c527.c | 0
drivers/net/{ => ethernet/i825xx}/3c527.h | 0
drivers/net/{ => ethernet/i825xx}/82596.c | 0
drivers/net/ethernet/i825xx/Kconfig | 178 ++
drivers/net/ethernet/i825xx/Makefile | 20 +
drivers/net/{ => ethernet/i825xx}/eepro.c | 0
drivers/net/{ => ethernet/i825xx}/eexpress.c | 0
drivers/net/{ => ethernet/i825xx}/eexpress.h | 0
drivers/net/{arm => ethernet/i825xx}/ether1.c | 0
drivers/net/{arm => ethernet/i825xx}/ether1.h | 0
drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0
drivers/net/{ => ethernet/i825xx}/lib82596.c | 0
drivers/net/{ => ethernet/i825xx}/lp486e.c | 0
drivers/net/{ => ethernet/i825xx}/ni52.c | 0
drivers/net/{ => ethernet/i825xx}/ni52.h | 0
drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0
drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 0
drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0
drivers/net/{ => ethernet/i825xx}/znet.c | 0
drivers/net/ethernet/ibm/Kconfig | 58 +
drivers/net/ethernet/ibm/Makefile | 9 +
drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 42 +-
.../{ibm_newemac => ethernet/ibm/emac}/Makefile | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 0
drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
drivers/net/{ => ethernet/ibm}/iseries_veth.c | 0
drivers/net/ethernet/icplus/Kconfig | 13 +
drivers/net/ethernet/icplus/Makefile | 5 +
drivers/net/{ => ethernet/icplus}/ipg.c | 0
drivers/net/{ => ethernet/icplus}/ipg.h | 0
drivers/net/ethernet/intel/Kconfig | 216 ++
drivers/net/ethernet/intel/Makefile | 12 +
drivers/net/{ => ethernet/intel}/e100.c | 0
drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
.../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
.../intel/e1000e/80003es2lan.c} | 0
drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
drivers/net/{ => ethernet/intel}/igb/Makefile | 0
drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
.../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
drivers/net/{ => ethernet/intel}/igb/igb.h | 0
drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
.../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
.../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
drivers/net/{ => ethernet}/jme.c | 0
drivers/net/{ => ethernet}/jme.h | 0
drivers/net/{ => ethernet}/korina.c | 0
drivers/net/{ => ethernet}/lantiq_etop.c | 0
drivers/net/ethernet/marvell/Kconfig | 107 +
drivers/net/ethernet/marvell/Makefile | 8 +
drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
drivers/net/{ => ethernet/marvell}/skge.c | 0
drivers/net/{ => ethernet/marvell}/skge.h | 0
drivers/net/{ => ethernet/marvell}/sky2.c | 0
drivers/net/{ => ethernet/marvell}/sky2.h | 0
drivers/net/ethernet/mellanox/Kconfig | 18 +
drivers/net/ethernet/mellanox/Makefile | 5 +
drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 +
drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
.../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
drivers/net/ethernet/micrel/Kconfig | 60 +
drivers/net/ethernet/micrel/Makefile | 9 +
drivers/net/{arm => ethernet/micrel}/ks8695net.c | 0
drivers/net/{arm => ethernet/micrel}/ks8695net.h | 0
drivers/net/{ => ethernet/micrel}/ks8842.c | 0
drivers/net/{ => ethernet/micrel}/ks8851.c | 0
drivers/net/{ => ethernet/micrel}/ks8851.h | 0
drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
drivers/net/ethernet/microchip/Kconfig | 33 +
drivers/net/ethernet/microchip/Makefile | 5 +
drivers/net/{ => ethernet/microchip}/enc28j60.c | 0
drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0
drivers/net/{ => ethernet}/mipsnet.c | 0
drivers/net/ethernet/myricom/Kconfig | 42 +
drivers/net/ethernet/myricom/Makefile | 5 +
.../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
.../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
.../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
.../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
drivers/net/ethernet/natsemi/Kconfig | 63 +
drivers/net/ethernet/natsemi/Makefile | 9 +
drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
drivers/net/{ => ethernet/natsemi}/sonic.c | 0
drivers/net/{ => ethernet/natsemi}/sonic.h | 0
drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
drivers/net/ethernet/neterion/Kconfig | 50 +
drivers/net/ethernet/neterion/Makefile | 6 +
drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
drivers/net/{ => ethernet/neterion}/s2io.c | 0
drivers/net/{ => ethernet/neterion}/s2io.h | 0
drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
.../{ => ethernet/neterion}/vxge/vxge-version.h | 0
drivers/net/{ => ethernet}/netx-eth.c | 0
drivers/net/ethernet/nuvoton/Kconfig | 25 +
drivers/net/ethernet/nuvoton/Makefile | 5 +
.../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 0
drivers/net/ethernet/nvidia/Kconfig | 27 +
drivers/net/ethernet/nvidia/Makefile | 5 +
drivers/net/{ => ethernet/nvidia}/forcedeth.c | 0
drivers/net/{ => ethernet}/octeon/Kconfig | 0
drivers/net/{ => ethernet}/octeon/Makefile | 0
drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 0
drivers/net/ethernet/oki-semi/Kconfig | 18 +
drivers/net/ethernet/oki-semi/Makefile | 5 +
drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 20 +
.../net/{ => ethernet/oki-semi}/pch_gbe/Makefile | 0
.../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0
.../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c | 0
.../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h | 0
.../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0
.../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c | 0
.../oki-semi}/pch_gbe/pch_gbe_param.c | 0
.../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c | 0
.../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h | 0
drivers/net/ethernet/packetengines/Kconfig | 42 +
drivers/net/ethernet/packetengines/Makefile | 6 +
drivers/net/{ => ethernet/packetengines}/hamachi.c | 0
.../net/{ => ethernet/packetengines}/yellowfin.c | 0
drivers/net/ethernet/pasemi/Kconfig | 25 +
drivers/net/ethernet/pasemi/Makefile | 5 +
drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 0
drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0
.../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0
drivers/net/ethernet/qlogic/Kconfig | 49 +
drivers/net/ethernet/qlogic/Makefile | 8 +
drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
.../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
.../qlogic}/netxen/netxen_nic_ethtool.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
.../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
.../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
drivers/net/ethernet/racal/Kconfig | 28 +
drivers/net/ethernet/racal/Makefile | 5 +
drivers/net/{ => ethernet/racal}/ni5010.c | 0
drivers/net/{ => ethernet/racal}/ni5010.h | 0
drivers/net/ethernet/rdc/Kconfig | 29 +
drivers/net/ethernet/rdc/Makefile | 5 +
drivers/net/{ => ethernet/rdc}/r6040.c | 0
drivers/net/{ => ethernet/realtek}/8139cp.c | 0
drivers/net/{ => ethernet/realtek}/8139too.c | 0
drivers/net/ethernet/realtek/Kconfig | 122 +
drivers/net/ethernet/realtek/Makefile | 9 +
drivers/net/{ => ethernet/realtek}/atp.c | 0
drivers/net/{ => ethernet/realtek}/atp.h | 0
drivers/net/{ => ethernet/realtek}/pci-skeleton.c | 0
drivers/net/{ => ethernet/realtek}/r8169.c | 0
drivers/net/{ => ethernet/realtek}/sc92031.c | 0
drivers/net/ethernet/renesas/Kconfig | 18 +
drivers/net/ethernet/renesas/Makefile | 5 +
drivers/net/{ => ethernet/renesas}/sh_eth.c | 0
drivers/net/{ => ethernet/renesas}/sh_eth.h | 0
drivers/net/{ => ethernet}/s6gmac.c | 0
drivers/net/ethernet/seeq/Kconfig | 41 +
drivers/net/ethernet/seeq/Makefile | 7 +
drivers/net/{arm => ethernet/seeq}/ether3.c | 0
drivers/net/{arm => ethernet/seeq}/ether3.h | 0
drivers/net/{ => ethernet/seeq}/seeq8005.c | 0
drivers/net/{ => ethernet/seeq}/seeq8005.h | 0
drivers/net/{ => ethernet/seeq}/sgiseeq.c | 0
drivers/net/{ => ethernet/seeq}/sgiseeq.h | 0
drivers/net/{ => ethernet}/sfc/Kconfig | 4 +-
drivers/net/{ => ethernet}/sfc/Makefile | 0
drivers/net/{ => ethernet}/sfc/bitfield.h | 0
drivers/net/{ => ethernet}/sfc/efx.c | 0
drivers/net/{ => ethernet}/sfc/efx.h | 0
drivers/net/{ => ethernet}/sfc/enum.h | 0
drivers/net/{ => ethernet}/sfc/ethtool.c | 0
drivers/net/{ => ethernet}/sfc/falcon.c | 0
drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
drivers/net/{ => ethernet}/sfc/filter.c | 0
drivers/net/{ => ethernet}/sfc/filter.h | 0
drivers/net/{ => ethernet}/sfc/io.h | 0
drivers/net/{ => ethernet}/sfc/mac.h | 0
drivers/net/{ => ethernet}/sfc/mcdi.c | 0
drivers/net/{ => ethernet}/sfc/mcdi.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
drivers/net/{ => ethernet}/sfc/mtd.c | 0
drivers/net/{ => ethernet}/sfc/net_driver.h | 0
drivers/net/{ => ethernet}/sfc/nic.c | 0
drivers/net/{ => ethernet}/sfc/nic.h | 0
drivers/net/{ => ethernet}/sfc/phy.h | 0
drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
drivers/net/{ => ethernet}/sfc/regs.h | 0
drivers/net/{ => ethernet}/sfc/rx.c | 0
drivers/net/{ => ethernet}/sfc/selftest.c | 0
drivers/net/{ => ethernet}/sfc/selftest.h | 0
drivers/net/{ => ethernet}/sfc/siena.c | 0
drivers/net/{ => ethernet}/sfc/spi.h | 0
drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
drivers/net/{ => ethernet}/sfc/tx.c | 0
drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
drivers/net/{ => ethernet}/sfc/workarounds.h | 0
drivers/net/ethernet/sgi/Kconfig | 30 +
drivers/net/ethernet/sgi/Makefile | 6 +
drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
drivers/net/{ => ethernet/sgi}/meth.c | 0
drivers/net/{ => ethernet/sgi}/meth.h | 0
drivers/net/ethernet/sis/Kconfig | 46 +
drivers/net/ethernet/sis/Makefile | 6 +
drivers/net/{ => ethernet/sis}/sis190.c | 0
drivers/net/{ => ethernet/sis}/sis900.c | 0
drivers/net/{ => ethernet/sis}/sis900.h | 0
drivers/net/ethernet/smsc/Kconfig | 128 +
drivers/net/ethernet/smsc/Makefile | 11 +
drivers/net/{ => ethernet/smsc}/epic100.c | 0
drivers/net/{ => ethernet/smsc}/smc911x.c | 0
drivers/net/{ => ethernet/smsc}/smc911x.h | 0
drivers/net/{ => ethernet/smsc}/smc9194.c | 0
drivers/net/{ => ethernet/smsc}/smc9194.h | 0
.../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 0
drivers/net/{ => ethernet/smsc}/smc91x.c | 0
drivers/net/{ => ethernet/smsc}/smc91x.h | 0
drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
drivers/net/ethernet/stmicro/Kconfig | 18 +
drivers/net/ethernet/stmicro/Makefile | 5 +
drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 +-
drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 0
drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 0
drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
.../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
.../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
drivers/net/ethernet/sun/Kconfig | 82 +
drivers/net/ethernet/sun/Makefile | 11 +
drivers/net/{ => ethernet/sun}/cassini.c | 0
drivers/net/{ => ethernet/sun}/cassini.h | 0
drivers/net/{ => ethernet/sun}/niu.c | 0
drivers/net/{ => ethernet/sun}/niu.h | 0
drivers/net/{ => ethernet/sun}/sunbmac.c | 0
drivers/net/{ => ethernet/sun}/sunbmac.h | 0
drivers/net/{ => ethernet/sun}/sungem.c | 0
drivers/net/{ => ethernet/sun}/sungem.h | 0
drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
drivers/net/{ => ethernet/sun}/sunhme.c | 0
drivers/net/{ => ethernet/sun}/sunhme.h | 0
drivers/net/{ => ethernet/sun}/sunqe.c | 0
drivers/net/{ => ethernet/sun}/sunqe.h | 0
drivers/net/{ => ethernet/sun}/sunvnet.c | 0
drivers/net/{ => ethernet/sun}/sunvnet.h | 0
drivers/net/ethernet/tehuti/Kconfig | 22 +
drivers/net/ethernet/tehuti/Makefile | 5 +
drivers/net/{ => ethernet/tehuti}/tehuti.c | 0
drivers/net/{ => ethernet/tehuti}/tehuti.h | 0
drivers/net/ethernet/ti/Kconfig | 72 +
drivers/net/ethernet/ti/Makefile | 9 +
drivers/net/{ => ethernet/ti}/cpmac.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
drivers/net/{ => ethernet/ti}/davinci_emac.c | 0
drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
drivers/net/{ => ethernet/ti}/tlan.c | 0
drivers/net/{ => ethernet/ti}/tlan.h | 0
drivers/net/ethernet/tile/Kconfig | 28 +
drivers/net/{ => ethernet}/tile/Makefile | 0
drivers/net/{ => ethernet}/tile/tilepro.c | 0
drivers/net/ethernet/toshiba/Kconfig | 52 +
drivers/net/ethernet/toshiba/Makefile | 10 +
drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c | 0
drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h | 0
.../{ => ethernet/toshiba}/ps3_gelic_wireless.c | 0
.../{ => ethernet/toshiba}/ps3_gelic_wireless.h | 0
drivers/net/{ => ethernet/toshiba}/spider_net.c | 0
drivers/net/{ => ethernet/toshiba}/spider_net.h | 2 +-
.../{ => ethernet/toshiba}/spider_net_ethtool.c | 0
drivers/net/{ => ethernet/toshiba}/tc35815.c | 0
drivers/net/ethernet/tundra/Kconfig | 24 +
drivers/net/ethernet/tundra/Makefile | 5 +
drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 0
drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
drivers/net/ethernet/via/Kconfig | 52 +
drivers/net/ethernet/via/Makefile | 6 +
drivers/net/{ => ethernet/via}/via-rhine.c | 0
drivers/net/{ => ethernet/via}/via-velocity.c | 0
drivers/net/{ => ethernet/via}/via-velocity.h | 0
drivers/net/ethernet/xilinx/Kconfig | 31 +
drivers/net/ethernet/xilinx/Makefile | 7 +
drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
.../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
drivers/net/ethernet/xircom/Kconfig | 26 +
drivers/net/ethernet/xircom/Makefile | 5 +
.../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c | 0
drivers/net/ethernet/xscale/Kconfig | 27 +
drivers/net/ethernet/xscale/Makefile | 6 +
drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig | 4 +-
drivers/net/{ => ethernet/xscale}/ixp2000/Makefile | 0
drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c | 0
drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h | 0
.../net/{ => ethernet/xscale}/ixp2000/enp2611.c | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc | 0
.../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode | 0
drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c | 0
drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h | 0
.../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h | 0
drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c | 0
drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h | 0
drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c | 0
drivers/net/pcmcia/Kconfig | 78 -
drivers/net/pcmcia/Makefile | 8 -
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2i/bnx2i.h | 2 +-
drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
901 files changed, 4429 insertions(+), 3350 deletions(-)
delete mode 100644 drivers/net/arm/Kconfig
delete mode 100644 drivers/net/arm/Makefile
delete mode 100644 drivers/net/benet/Kconfig
rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
create mode 100644 drivers/net/ethernet/3com/Kconfig
create mode 100644 drivers/net/ethernet/3com/Makefile
rename drivers/net/{ => ethernet/3com}/acenic.c (100%)
rename drivers/net/{ => ethernet/3com}/acenic.h (100%)
rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
rename drivers/net/{ => ethernet/8390}/3c503.c (100%)
rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
rename drivers/net/{ => ethernet/8390}/8390.c (100%)
rename drivers/net/{ => ethernet/8390}/8390.h (100%)
rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
create mode 100644 drivers/net/ethernet/8390/Kconfig
create mode 100644 drivers/net/ethernet/8390/Makefile
rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
rename drivers/net/{ => ethernet/8390}/apne.c (100%)
rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
rename drivers/net/{ => ethernet/8390}/hp.c (100%)
rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
rename drivers/net/{ => ethernet/8390}/ne.c (100%)
rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
rename drivers/net/{ => ethernet/8390}/wd.c (100%)
rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
create mode 100644 drivers/net/ethernet/Kconfig
create mode 100644 drivers/net/ethernet/Makefile
create mode 100644 drivers/net/ethernet/adaptec/Kconfig
create mode 100644 drivers/net/ethernet/adaptec/Makefile
rename drivers/net/{ => ethernet/adaptec}/starfire.c (100%)
create mode 100644 drivers/net/ethernet/adi/Kconfig
create mode 100644 drivers/net/ethernet/adi/Makefile
rename drivers/net/{ => ethernet/adi}/bfin_mac.c (100%)
rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
create mode 100644 drivers/net/ethernet/aeroflex/Makefile
rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
rename drivers/net/{ => ethernet/amd}/7990.c (100%)
rename drivers/net/{ => ethernet/amd}/7990.h (100%)
create mode 100644 drivers/net/ethernet/amd/Kconfig
create mode 100644 drivers/net/ethernet/amd/Makefile
rename drivers/net/{ => ethernet/amd}/a2065.c (100%)
rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
rename drivers/net/{arm => ethernet/amd}/am79c961a.c (100%)
rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
rename drivers/net/{ => ethernet/amd}/ariadne.c (100%)
rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
rename drivers/net/{ => ethernet/amd}/au1000_eth.c (100%)
rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
rename drivers/net/{ => ethernet/amd}/declance.c (100%)
rename drivers/net/{ => ethernet/amd}/depca.c (100%)
rename drivers/net/{ => ethernet/amd}/depca.h (100%)
rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
rename drivers/net/{ => ethernet/amd}/lance.c (100%)
rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
rename drivers/net/{ => ethernet/amd}/ni65.c (100%)
rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (100%)
rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
create mode 100644 drivers/net/ethernet/apple/Kconfig
create mode 100644 drivers/net/ethernet/apple/Makefile
rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.h (100%)
rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
create mode 100644 drivers/net/ethernet/atheros/Kconfig
create mode 100644 drivers/net/ethernet/atheros/Makefile
rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
create mode 100644 drivers/net/ethernet/broadcom/Kconfig
create mode 100644 drivers/net/ethernet/broadcom/Makefile
rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
create mode 100644 drivers/net/ethernet/brocade/Kconfig
create mode 100644 drivers/net/ethernet/brocade/Makefile
create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
create mode 100644 drivers/net/ethernet/cadence/Kconfig
create mode 100644 drivers/net/ethernet/cadence/Makefile
rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (100%)
rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
rename drivers/net/{ => ethernet/cadence}/macb.c (100%)
rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
create mode 100644 drivers/net/ethernet/chelsio/Kconfig
create mode 100644 drivers/net/ethernet/chelsio/Makefile
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
create mode 100644 drivers/net/ethernet/cirrus/Kconfig
create mode 100644 drivers/net/ethernet/cirrus/Makefile
rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
create mode 100644 drivers/net/ethernet/cisco/Kconfig
create mode 100644 drivers/net/ethernet/cisco/Makefile
create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
create mode 100644 drivers/net/ethernet/davicom/Kconfig
create mode 100644 drivers/net/ethernet/davicom/Makefile
rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
create mode 100644 drivers/net/ethernet/dec/Kconfig
create mode 100644 drivers/net/ethernet/dec/Makefile
rename drivers/net/{ => ethernet/dec}/ewrk3.c (100%)
rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (93%)
rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (100%)
rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
create mode 100644 drivers/net/ethernet/dlink/Kconfig
create mode 100644 drivers/net/ethernet/dlink/Makefile
rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
rename drivers/net/{ => ethernet/dlink}/sundance.c (100%)
rename drivers/net/{ => ethernet}/dnet.c (100%)
rename drivers/net/{ => ethernet}/dnet.h (100%)
create mode 100644 drivers/net/ethernet/emulex/Kconfig
create mode 100644 drivers/net/ethernet/emulex/Makefile
create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)
rename drivers/net/{ => ethernet}/ethoc.c (100%)
create mode 100644 drivers/net/ethernet/faraday/Kconfig
create mode 100644 drivers/net/ethernet/faraday/Makefile
rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
rename drivers/net/{ => ethernet}/fealnx.c (100%)
create mode 100644 drivers/net/ethernet/freescale/Kconfig
create mode 100644 drivers/net/ethernet/freescale/Makefile
rename drivers/net/{ => ethernet/freescale}/fec.c (100%)
rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (100%)
rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
create mode 100644 drivers/net/ethernet/fujitsu/Makefile
rename drivers/net/{ => ethernet/fujitsu}/at1700.c (100%)
rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (100%)
rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (100%)
create mode 100644 drivers/net/ethernet/hp/Kconfig
create mode 100644 drivers/net/ethernet/hp/Makefile
rename drivers/net/{ => ethernet/hp}/hp100.c (100%)
rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
rename drivers/net/{ => ethernet/i825xx}/3c505.c (100%)
rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
rename drivers/net/{ => ethernet/i825xx}/3c523.c (100%)
rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
rename drivers/net/{ => ethernet/i825xx}/3c527.c (100%)
rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
rename drivers/net/{ => ethernet/i825xx}/82596.c (100%)
create mode 100644 drivers/net/ethernet/i825xx/Kconfig
create mode 100644 drivers/net/ethernet/i825xx/Makefile
rename drivers/net/{ => ethernet/i825xx}/eepro.c (100%)
rename drivers/net/{ => ethernet/i825xx}/eexpress.c (100%)
rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
rename drivers/net/{arm => ethernet/i825xx}/ether1.c (100%)
rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/lib82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/lp486e.c (100%)
rename drivers/net/{ => ethernet/i825xx}/ni52.c (100%)
rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (100%)
rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
rename drivers/net/{ => ethernet/i825xx}/znet.c (100%)
create mode 100644 drivers/net/ethernet/ibm/Kconfig
create mode 100644 drivers/net/ethernet/ibm/Makefile
rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (61%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (100%)
create mode 100644 drivers/net/ethernet/icplus/Kconfig
create mode 100644 drivers/net/ethernet/icplus/Makefile
rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
create mode 100644 drivers/net/ethernet/intel/Kconfig
create mode 100644 drivers/net/ethernet/intel/Makefile
rename drivers/net/{ => ethernet/intel}/e100.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
rename drivers/net/{ => ethernet}/jme.c (100%)
rename drivers/net/{ => ethernet}/jme.h (100%)
rename drivers/net/{ => ethernet}/korina.c (100%)
rename drivers/net/{ => ethernet}/lantiq_etop.c (100%)
create mode 100644 drivers/net/ethernet/marvell/Kconfig
create mode 100644 drivers/net/ethernet/marvell/Makefile
rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
rename drivers/net/{ => ethernet/marvell}/skge.c (100%)
rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
rename drivers/net/{ => ethernet/marvell}/sky2.c (100%)
rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
create mode 100644 drivers/net/ethernet/mellanox/Kconfig
create mode 100644 drivers/net/ethernet/mellanox/Makefile
create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
create mode 100644 drivers/net/ethernet/micrel/Kconfig
create mode 100644 drivers/net/ethernet/micrel/Makefile
rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (100%)
rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
create mode 100644 drivers/net/ethernet/microchip/Kconfig
create mode 100644 drivers/net/ethernet/microchip/Makefile
rename drivers/net/{ => ethernet/microchip}/enc28j60.c (100%)
rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
rename drivers/net/{ => ethernet}/mipsnet.c (100%)
create mode 100644 drivers/net/ethernet/myricom/Kconfig
create mode 100644 drivers/net/ethernet/myricom/Makefile
rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
create mode 100644 drivers/net/ethernet/natsemi/Kconfig
create mode 100644 drivers/net/ethernet/natsemi/Makefile
rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
create mode 100644 drivers/net/ethernet/neterion/Kconfig
create mode 100644 drivers/net/ethernet/neterion/Makefile
rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
rename drivers/net/{ => ethernet}/netx-eth.c (100%)
create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
create mode 100644 drivers/net/ethernet/nuvoton/Makefile
rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (100%)
create mode 100644 drivers/net/ethernet/nvidia/Kconfig
create mode 100644 drivers/net/ethernet/nvidia/Makefile
rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (100%)
rename drivers/net/{ => ethernet}/octeon/Kconfig (100%)
rename drivers/net/{ => ethernet}/octeon/Makefile (100%)
rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
create mode 100644 drivers/net/ethernet/oki-semi/Makefile
create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
create mode 100644 drivers/net/ethernet/packetengines/Kconfig
create mode 100644 drivers/net/ethernet/packetengines/Makefile
rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
create mode 100644 drivers/net/ethernet/pasemi/Kconfig
create mode 100644 drivers/net/ethernet/pasemi/Makefile
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (100%)
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
create mode 100644 drivers/net/ethernet/qlogic/Kconfig
create mode 100644 drivers/net/ethernet/qlogic/Makefile
rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
create mode 100644 drivers/net/ethernet/racal/Kconfig
create mode 100644 drivers/net/ethernet/racal/Makefile
rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
create mode 100644 drivers/net/ethernet/rdc/Kconfig
create mode 100644 drivers/net/ethernet/rdc/Makefile
rename drivers/net/{ => ethernet/rdc}/r6040.c (100%)
rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
create mode 100644 drivers/net/ethernet/realtek/Kconfig
create mode 100644 drivers/net/ethernet/realtek/Makefile
rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
rename drivers/net/{ => ethernet/realtek}/pci-skeleton.c (100%)
rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)
rename drivers/net/{ => ethernet/realtek}/sc92031.c (100%)
create mode 100644 drivers/net/ethernet/renesas/Kconfig
create mode 100644 drivers/net/ethernet/renesas/Makefile
rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
rename drivers/net/{ => ethernet}/s6gmac.c (100%)
create mode 100644 drivers/net/ethernet/seeq/Kconfig
create mode 100644 drivers/net/ethernet/seeq/Makefile
rename drivers/net/{arm => ethernet/seeq}/ether3.c (100%)
rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
rename drivers/net/{ => ethernet/seeq}/seeq8005.c (100%)
rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (100%)
rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
rename drivers/net/{ => ethernet}/sfc/io.h (100%)
rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
create mode 100644 drivers/net/ethernet/sgi/Kconfig
create mode 100644 drivers/net/ethernet/sgi/Makefile
rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
create mode 100644 drivers/net/ethernet/sis/Kconfig
create mode 100644 drivers/net/ethernet/sis/Makefile
rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
create mode 100644 drivers/net/ethernet/smsc/Kconfig
create mode 100644 drivers/net/ethernet/smsc/Makefile
rename drivers/net/{ => ethernet/smsc}/epic100.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smc9194.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc91x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
create mode 100644 drivers/net/ethernet/stmicro/Kconfig
create mode 100644 drivers/net/ethernet/stmicro/Makefile
rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
create mode 100644 drivers/net/ethernet/sun/Kconfig
create mode 100644 drivers/net/ethernet/sun/Makefile
rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
rename drivers/net/{ => ethernet/sun}/niu.c (100%)
rename drivers/net/{ => ethernet/sun}/niu.h (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
create mode 100644 drivers/net/ethernet/tehuti/Kconfig
create mode 100644 drivers/net/ethernet/tehuti/Makefile
rename drivers/net/{ => ethernet/tehuti}/tehuti.c (100%)
rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
create mode 100644 drivers/net/ethernet/ti/Kconfig
create mode 100644 drivers/net/ethernet/ti/Makefile
rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
rename drivers/net/{ => ethernet/ti}/davinci_emac.c (100%)
rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
create mode 100644 drivers/net/ethernet/tile/Kconfig
rename drivers/net/{ => ethernet}/tile/Makefile (100%)
rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
create mode 100644 drivers/net/ethernet/toshiba/Kconfig
create mode 100644 drivers/net/ethernet/toshiba/Makefile
rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (100%)
rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (100%)
rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
rename drivers/net/{ => ethernet/toshiba}/spider_net.c (100%)
rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
rename drivers/net/{ => ethernet/toshiba}/tc35815.c (100%)
create mode 100644 drivers/net/ethernet/tundra/Kconfig
create mode 100644 drivers/net/ethernet/tundra/Makefile
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%)
rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
create mode 100644 drivers/net/ethernet/via/Kconfig
create mode 100644 drivers/net/ethernet/via/Makefile
rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
rename drivers/net/{ => ethernet/via}/via-velocity.c (100%)
rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
create mode 100644 drivers/net/ethernet/xilinx/Kconfig
create mode 100644 drivers/net/ethernet/xilinx/Makefile
rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
create mode 100644 drivers/net/ethernet/xircom/Kconfig
create mode 100644 drivers/net/ethernet/xircom/Makefile
rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (100%)
create mode 100644 drivers/net/ethernet/xscale/Kconfig
create mode 100644 drivers/net/ethernet/xscale/Makefile
rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (76%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (100%)
--
1.7.6
^ permalink raw reply
* [net-next v2 02/71] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Philip Blundell,
Steffen Klassert, David Dillow, Jes Sorensen, Alan Cox,
Donald Becker, Craig Southeren, David Hinds
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
Kconfig and Makefile changes.
CC: Philip Blundell <philb@gnu.org>
CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
CC: David Dillow <dave@thedillows.org>
CC: Jes Sorensen <jes@trained-monkey.org>
CC: Alan Cox <alan@linux.intel.com>
CC: Donald Becker <becker@scyld.com>
CC: Craig Southeren <craigs@ineluki.apana.org.au>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David Dillow <dave@thedillows.org>
---
MAINTAINERS | 8 +-
drivers/net/Kconfig | 177 -------------------
drivers/net/Makefile | 11 +-
drivers/net/{ => ethernet/3com}/3c501.c | 0
drivers/net/{ => ethernet/3com}/3c501.h | 0
drivers/net/{ => ethernet/3com}/3c505.c | 0
drivers/net/{ => ethernet/3com}/3c505.h | 0
drivers/net/{ => ethernet/3com}/3c507.c | 0
drivers/net/{ => ethernet/3com}/3c509.c | 0
drivers/net/{ => ethernet/3com}/3c515.c | 0
drivers/net/{ => ethernet/3com}/3c523.c | 0
drivers/net/{ => ethernet/3com}/3c523.h | 0
drivers/net/{ => ethernet/3com}/3c527.c | 0
drivers/net/{ => ethernet/3com}/3c527.h | 0
drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 0
drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 0
drivers/net/{ => ethernet/3com}/3c59x.c | 0
drivers/net/ethernet/3com/Kconfig | 200 ++++++++++++++++++++++
drivers/net/ethernet/3com/Makefile | 16 ++
drivers/net/{ => ethernet/3com}/acenic.c | 0
drivers/net/{ => ethernet/3com}/acenic.h | 0
drivers/net/{ => ethernet/3com}/typhoon.c | 0
drivers/net/{ => ethernet/3com}/typhoon.h | 0
drivers/net/ethernet/Kconfig | 2 +
drivers/net/ethernet/Makefile | 2 +
drivers/net/pcmcia/Kconfig | 18 --
drivers/net/pcmcia/Makefile | 2 -
27 files changed, 225 insertions(+), 211 deletions(-)
rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
rename drivers/net/{ => ethernet/3com}/3c505.c (100%)
rename drivers/net/{ => ethernet/3com}/3c505.h (100%)
rename drivers/net/{ => ethernet/3com}/3c507.c (100%)
rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
rename drivers/net/{ => ethernet/3com}/3c523.c (100%)
rename drivers/net/{ => ethernet/3com}/3c523.h (100%)
rename drivers/net/{ => ethernet/3com}/3c527.c (100%)
rename drivers/net/{ => ethernet/3com}/3c527.h (100%)
rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
create mode 100644 drivers/net/ethernet/3com/Kconfig
create mode 100644 drivers/net/ethernet/3com/Makefile
rename drivers/net/{ => ethernet/3com}/acenic.c (100%)
rename drivers/net/{ => ethernet/3com}/acenic.h (100%)
rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 91e5cc7..f77c3ac 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/3com/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>
@@ -214,7 +214,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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5b95796..17ef5c2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -616,156 +616,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
@@ -2046,33 +1896,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 670b514..c8223a1 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -66,8 +66,6 @@ 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
@@ -78,7 +76,6 @@ 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
@@ -187,13 +184,7 @@ 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
@@ -206,7 +197,6 @@ 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
@@ -269,6 +259,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/
diff --git a/drivers/net/3c501.c b/drivers/net/ethernet/3com/3c501.c
similarity index 100%
rename from drivers/net/3c501.c
rename to drivers/net/ethernet/3com/3c501.c
diff --git a/drivers/net/3c501.h b/drivers/net/ethernet/3com/3c501.h
similarity index 100%
rename from drivers/net/3c501.h
rename to drivers/net/ethernet/3com/3c501.h
diff --git a/drivers/net/3c505.c b/drivers/net/ethernet/3com/3c505.c
similarity index 100%
rename from drivers/net/3c505.c
rename to drivers/net/ethernet/3com/3c505.c
diff --git a/drivers/net/3c505.h b/drivers/net/ethernet/3com/3c505.h
similarity index 100%
rename from drivers/net/3c505.h
rename to drivers/net/ethernet/3com/3c505.h
diff --git a/drivers/net/3c507.c b/drivers/net/ethernet/3com/3c507.c
similarity index 100%
rename from drivers/net/3c507.c
rename to drivers/net/ethernet/3com/3c507.c
diff --git a/drivers/net/3c509.c b/drivers/net/ethernet/3com/3c509.c
similarity index 100%
rename from drivers/net/3c509.c
rename to drivers/net/ethernet/3com/3c509.c
diff --git a/drivers/net/3c515.c b/drivers/net/ethernet/3com/3c515.c
similarity index 100%
rename from drivers/net/3c515.c
rename to drivers/net/ethernet/3com/3c515.c
diff --git a/drivers/net/3c523.c b/drivers/net/ethernet/3com/3c523.c
similarity index 100%
rename from drivers/net/3c523.c
rename to drivers/net/ethernet/3com/3c523.c
diff --git a/drivers/net/3c523.h b/drivers/net/ethernet/3com/3c523.h
similarity index 100%
rename from drivers/net/3c523.h
rename to drivers/net/ethernet/3com/3c523.h
diff --git a/drivers/net/3c527.c b/drivers/net/ethernet/3com/3c527.c
similarity index 100%
rename from drivers/net/3c527.c
rename to drivers/net/ethernet/3com/3c527.c
diff --git a/drivers/net/3c527.h b/drivers/net/ethernet/3com/3c527.h
similarity index 100%
rename from drivers/net/3c527.h
rename to drivers/net/ethernet/3com/3c527.h
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
similarity index 100%
rename from drivers/net/pcmcia/3c574_cs.c
rename to drivers/net/ethernet/3com/3c574_cs.c
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
similarity index 100%
rename from drivers/net/pcmcia/3c589_cs.c
rename to drivers/net/ethernet/3com/3c589_cs.c
diff --git a/drivers/net/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
similarity index 100%
rename from drivers/net/3c59x.c
rename to 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 0000000..9b343d9
--- /dev/null
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -0,0 +1,200 @@
+#
+# 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.
+
+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 PCMCIA_3C574
+ tristate "3Com 3c574 PCMCIA support"
+ depends on NET_VENDOR_3COM && 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 NET_VENDOR_3COM && 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 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 ACENIC
+ tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
+ depends on NET_VENDOR_3COM && 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.
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
new file mode 100644
index 0000000..ba27c7e
--- /dev/null
+++ b/drivers/net/ethernet/3com/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for the 3Com Ethernet device drivers
+#
+
+obj-$(CONFIG_EL1) += 3c501.o
+obj-$(CONFIG_ELPLUS) += 3c505.o
+obj-$(CONFIG_EL16) += 3c507.o
+obj-$(CONFIG_EL3) += 3c509.o
+obj-$(CONFIG_3C515) += 3c515.o
+obj-$(CONFIG_ELMC) += 3c523.o
+obj-$(CONFIG_ELMC_II) += 3c527.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
similarity index 100%
rename from drivers/net/acenic.c
rename to drivers/net/ethernet/3com/acenic.c
diff --git a/drivers/net/acenic.h b/drivers/net/ethernet/3com/acenic.h
similarity index 100%
rename from drivers/net/acenic.h
rename to drivers/net/ethernet/3com/acenic.h
diff --git a/drivers/net/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
similarity index 100%
rename from drivers/net/typhoon.c
rename to drivers/net/ethernet/3com/typhoon.c
diff --git a/drivers/net/typhoon.h b/drivers/net/ethernet/3com/typhoon.h
similarity index 100%
rename from drivers/net/typhoon.h
rename to drivers/net/ethernet/3com/typhoon.h
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d59e4f2..18193ec 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -11,4 +11,6 @@ menuconfig ETHERNET
if ETHERNET
+source "drivers/net/ethernet/3com/Kconfig"
+
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0d21dda..07766ba 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -1,3 +1,5 @@
#
# Makefile for the Linux network Ethernet device drivers.
#
+
+obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 9b8f793..b67c5ed 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
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 87d2d99..2f2ab3b 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -3,8 +3,6 @@
#
# 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
--
1.7.6
^ permalink raw reply related
* [net-next v2 04/71] 8390: Move the 8390 related drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Donald Becker,
Paul Gortmaker, Alain Malek, Peter De Schrijver,
David Huggins-Daines, Wim Dumon, Yoshinori Sato, David Hinds,
Russell King
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the drivers for the National Semi-conductor 8390 chipset into
drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
changes.
CC: Donald Becker <becker@scyld.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Alain Malek <alain.malek@cryogen.com>
CC: Peter De Schrijver <p2@mind.be>
CC: "David Huggins-Daines" <dhd@debian.org>
CC: Wim Dumon <wimpie@kotnet.org>
CC: Yoshinori Sato <ysato@users.sourceforge.jp>
CC: David Hinds <dahinds@users.sourceforge.net>
CC: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 5 +-
drivers/net/Kconfig | 283 ------------------
drivers/net/Makefile | 23 --
drivers/net/arm/Kconfig | 8 -
drivers/net/arm/Makefile | 1 -
drivers/net/ethernet/3com/Kconfig | 12 -
drivers/net/{ => ethernet/8390}/3c503.c | 0
drivers/net/{ => ethernet/8390}/3c503.h | 0
drivers/net/{ => ethernet/8390}/8390.c | 0
drivers/net/{ => ethernet/8390}/8390.h | 0
drivers/net/{ => ethernet/8390}/8390p.c | 0
drivers/net/ethernet/8390/Kconfig | 344 ++++++++++++++++++++++
drivers/net/ethernet/8390/Makefile | 29 ++
drivers/net/{ => ethernet/8390}/ac3200.c | 0
drivers/net/{ => ethernet/8390}/apne.c | 0
drivers/net/{ => ethernet/8390}/ax88796.c | 0
drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 2 +-
drivers/net/{ => ethernet/8390}/e2100.c | 0
drivers/net/{ => ethernet/8390}/es3210.c | 0
drivers/net/{arm => ethernet/8390}/etherh.c | 2 +-
drivers/net/{ => ethernet/8390}/hp-plus.c | 0
drivers/net/{ => ethernet/8390}/hp.c | 0
drivers/net/{ => ethernet/8390}/hydra.c | 0
drivers/net/{ => ethernet/8390}/lib8390.c | 0
drivers/net/{ => ethernet/8390}/lne390.c | 0
drivers/net/{ => ethernet/8390}/mac8390.c | 0
drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
drivers/net/{ => ethernet/8390}/ne.c | 0
drivers/net/{ => ethernet/8390}/ne2.c | 0
drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
drivers/net/{ => ethernet/8390}/ne3210.c | 0
drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 2 +-
drivers/net/{ => ethernet/8390}/smc-mca.c | 0
drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
drivers/net/{ => ethernet/8390}/stnic.c | 0
drivers/net/{ => ethernet/8390}/wd.c | 0
drivers/net/{ => ethernet/8390}/zorro8390.c | 0
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/pcmcia/Kconfig | 21 --
drivers/net/pcmcia/Makefile | 2 -
42 files changed, 380 insertions(+), 356 deletions(-)
rename drivers/net/{ => ethernet/8390}/3c503.c (100%)
rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
rename drivers/net/{ => ethernet/8390}/8390.c (100%)
rename drivers/net/{ => ethernet/8390}/8390.h (100%)
rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
create mode 100644 drivers/net/ethernet/8390/Kconfig
create mode 100644 drivers/net/ethernet/8390/Makefile
rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
rename drivers/net/{ => ethernet/8390}/apne.c (100%)
rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
rename drivers/net/{ => ethernet/8390}/hp.c (100%)
rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
rename drivers/net/{ => ethernet/8390}/ne.c (100%)
rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
rename drivers/net/{ => ethernet/8390}/wd.c (100%)
rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a8711d..e7fea16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/ax88796.c
+F: drivers/net/ethernet/8390/
9P FILE SYSTEM
M: Eric Van Hensbergen <ericvh@gmail.com>
@@ -6390,7 +6389,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/net/Kconfig b/drivers/net/Kconfig
index e446460..077085d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,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
@@ -287,50 +271,6 @@ config BMAC
To compile this driver as a module, choose M here: the module
will be called bmac.
-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
@@ -449,18 +389,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 && \
@@ -534,74 +462,6 @@ config SUNVNET
help
Support for virtual network devices under Sun Logical Domains.
-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)
@@ -922,18 +782,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
@@ -975,30 +823,6 @@ config EEXPRESS_PRO
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
@@ -1018,26 +842,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
@@ -1059,18 +863,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
@@ -1126,18 +918,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
@@ -1253,18 +1033,6 @@ config E100
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
@@ -1285,50 +1053,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
@@ -1666,13 +1390,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0e06b05..9861f6f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
obj-$(CONFIG_E100) += e100.o
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_EPIC100) += epic100.o
@@ -77,7 +76,6 @@ obj-$(CONFIG_YELLOWFIN) += yellowfin.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
@@ -112,9 +110,6 @@ 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
@@ -122,24 +117,9 @@ 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
@@ -191,7 +171,6 @@ obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o
obj-$(CONFIG_NI5010) += ni5010.o
obj-$(CONFIG_NI52) += ni52.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
@@ -203,13 +182,11 @@ obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_LP486E) += lp486e.o
obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_HYDRA) += hydra.o
obj-$(CONFIG_CS89x0) += cs89x0.o
obj-$(CONFIG_MACSONIC) += macsonic.o
obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index d0c8cf2..715bf2a 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -17,14 +17,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 63c57be..f1e6150 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -3,7 +3,6 @@
# Makefile for the ARM network device drivers
#
-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
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 9b343d9..7cbeae7 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -29,18 +29,6 @@ config EL1
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
diff --git a/drivers/net/3c503.c b/drivers/net/ethernet/8390/3c503.c
similarity index 100%
rename from drivers/net/3c503.c
rename to drivers/net/ethernet/8390/3c503.c
diff --git a/drivers/net/3c503.h b/drivers/net/ethernet/8390/3c503.h
similarity index 100%
rename from drivers/net/3c503.h
rename to drivers/net/ethernet/8390/3c503.h
diff --git a/drivers/net/8390.c b/drivers/net/ethernet/8390/8390.c
similarity index 100%
rename from drivers/net/8390.c
rename to drivers/net/ethernet/8390/8390.c
diff --git a/drivers/net/8390.h b/drivers/net/ethernet/8390/8390.h
similarity index 100%
rename from drivers/net/8390.h
rename to drivers/net/ethernet/8390/8390.h
diff --git a/drivers/net/8390p.c b/drivers/net/ethernet/8390/8390p.c
similarity index 100%
rename from drivers/net/8390p.c
rename to 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 0000000..072c641
--- /dev/null
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -0,0 +1,344 @@
+#
+# 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.
+
+config EL2
+ tristate "3c503 \"EtherLink II\" support"
+ depends on NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && (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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && (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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_8390 && 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 NET_VENDOR_SMC
+ bool "Western Digital/SMC cards"
+ depends on NET_VENDOR_8390 && (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 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 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 ZORRO8390
+ tristate "Zorro NS8390-based Ethernet support"
+ depends on NET_VENDOR_8390 && 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.
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
new file mode 100644
index 0000000..3337d7f
--- /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
similarity index 100%
rename from drivers/net/ac3200.c
rename to drivers/net/ethernet/8390/ac3200.c
diff --git a/drivers/net/apne.c b/drivers/net/ethernet/8390/apne.c
similarity index 100%
rename from drivers/net/apne.c
rename to drivers/net/ethernet/8390/apne.c
diff --git a/drivers/net/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
similarity index 100%
rename from drivers/net/ax88796.c
rename to drivers/net/ethernet/8390/ax88796.c
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
similarity index 99%
rename from drivers/net/pcmcia/axnet_cs.c
rename to drivers/net/ethernet/8390/axnet_cs.c
index 9953db7..3e4b926 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
similarity index 100%
rename from drivers/net/e2100.c
rename to drivers/net/ethernet/8390/e2100.c
diff --git a/drivers/net/es3210.c b/drivers/net/ethernet/8390/es3210.c
similarity index 100%
rename from drivers/net/es3210.c
rename to drivers/net/ethernet/8390/es3210.c
diff --git a/drivers/net/arm/etherh.c b/drivers/net/ethernet/8390/etherh.c
similarity index 99%
rename from drivers/net/arm/etherh.c
rename to drivers/net/ethernet/8390/etherh.c
index 03e217a..cf851fa 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
similarity index 100%
rename from drivers/net/hp-plus.c
rename to drivers/net/ethernet/8390/hp-plus.c
diff --git a/drivers/net/hp.c b/drivers/net/ethernet/8390/hp.c
similarity index 100%
rename from drivers/net/hp.c
rename to drivers/net/ethernet/8390/hp.c
diff --git a/drivers/net/hydra.c b/drivers/net/ethernet/8390/hydra.c
similarity index 100%
rename from drivers/net/hydra.c
rename to drivers/net/ethernet/8390/hydra.c
diff --git a/drivers/net/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
similarity index 100%
rename from drivers/net/lib8390.c
rename to drivers/net/ethernet/8390/lib8390.c
diff --git a/drivers/net/lne390.c b/drivers/net/ethernet/8390/lne390.c
similarity index 100%
rename from drivers/net/lne390.c
rename to drivers/net/ethernet/8390/lne390.c
diff --git a/drivers/net/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
similarity index 100%
rename from drivers/net/mac8390.c
rename to drivers/net/ethernet/8390/mac8390.c
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c
similarity index 100%
rename from drivers/net/ne-h8300.c
rename to drivers/net/ethernet/8390/ne-h8300.c
diff --git a/drivers/net/ne.c b/drivers/net/ethernet/8390/ne.c
similarity index 100%
rename from drivers/net/ne.c
rename to drivers/net/ethernet/8390/ne.c
diff --git a/drivers/net/ne2.c b/drivers/net/ethernet/8390/ne2.c
similarity index 100%
rename from drivers/net/ne2.c
rename to drivers/net/ethernet/8390/ne2.c
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
similarity index 100%
rename from drivers/net/ne2k-pci.c
rename to drivers/net/ethernet/8390/ne2k-pci.c
diff --git a/drivers/net/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
similarity index 100%
rename from drivers/net/ne3210.c
rename to drivers/net/ethernet/8390/ne3210.c
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
similarity index 99%
rename from drivers/net/pcmcia/pcnet_cs.c
rename to drivers/net/ethernet/8390/pcnet_cs.c
index b4fd7c3..4010761 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
similarity index 100%
rename from drivers/net/smc-mca.c
rename to drivers/net/ethernet/8390/smc-mca.c
diff --git a/drivers/net/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
similarity index 100%
rename from drivers/net/smc-ultra.c
rename to drivers/net/ethernet/8390/smc-ultra.c
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c
similarity index 100%
rename from drivers/net/smc-ultra32.c
rename to drivers/net/ethernet/8390/smc-ultra32.c
diff --git a/drivers/net/stnic.c b/drivers/net/ethernet/8390/stnic.c
similarity index 100%
rename from drivers/net/stnic.c
rename to drivers/net/ethernet/8390/stnic.c
diff --git a/drivers/net/wd.c b/drivers/net/ethernet/8390/wd.c
similarity index 100%
rename from drivers/net/wd.c
rename to drivers/net/ethernet/8390/wd.c
diff --git a/drivers/net/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
similarity index 100%
rename from drivers/net/zorro8390.c
rename to drivers/net/ethernet/8390/zorro8390.c
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 5e62efd..56ed5ec 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,6 +12,7 @@ menuconfig ETHERNET
if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/amd/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1bc2ac2..fc82588 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -3,4 +3,5 @@
#
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
+obj-$(CONFIG_NET_VENDOR_8390) += 8390/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index e17ad95..72aa257 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -31,16 +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_SMC91C92
tristate "SMC 91Cxx PCMCIA support"
select CRC32
@@ -61,17 +51,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 985f0ae..c2b8b44 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -4,10 +4,8 @@
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_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
--
1.7.6
^ permalink raw reply related
* [net-next v2 03/71] amd: Move AMD (Lance) chipset drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Peter Maydell, Roman Hodek,
Maciej W. Rozycki, Donald Becker, Sam Creasey, Miguel de Icaza,
Thomas Bogendoerfer, Don Fry, Geert Uytterhoeven, Russell King,
David Davies, M.Hipp, Pete Popov, David Hinds, Roger C. Pao
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
and the necessary Kconfig and Makfile changes.
The au1000 (Alchemy) driver was also moved into the same directory
even though it is not a "Lance" driver.
CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Donald Becker <becker@scyld.com>
CC: Sam Creasey <sammy@users.qual.net>
CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
CC: Don Fry <pcnet32@frontier.com>
CC: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Russell King <linux@arm.linux.org.uk>
CC: David Davies <davies@maniac.ultranet.com>
CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
CC: Pete Popov <ppopov@embeddedalley.com>
CC: David Hinds <dahinds@users.sourceforge.net>
CC: "Roger C. Pao" <rpao@paonet.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 153 ------------------
drivers/net/Makefile | 14 --
drivers/net/arm/Kconfig | 7 -
drivers/net/arm/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet/amd}/7990.c | 0
drivers/net/{ => ethernet/amd}/7990.h | 0
drivers/net/ethernet/amd/Kconfig | 188 ++++++++++++++++++++++
drivers/net/ethernet/amd/Makefile | 20 +++
drivers/net/{ => ethernet/amd}/a2065.c | 0
drivers/net/{ => ethernet/amd}/a2065.h | 0
drivers/net/{arm => ethernet/amd}/am79c961a.c | 0
drivers/net/{arm => ethernet/amd}/am79c961a.h | 0
drivers/net/{ => ethernet/amd}/amd8111e.c | 0
drivers/net/{ => ethernet/amd}/amd8111e.h | 0
drivers/net/{ => ethernet/amd}/ariadne.c | 0
drivers/net/{ => ethernet/amd}/ariadne.h | 0
drivers/net/{ => ethernet/amd}/atarilance.c | 0
drivers/net/{ => ethernet/amd}/au1000_eth.c | 0
drivers/net/{ => ethernet/amd}/au1000_eth.h | 0
drivers/net/{ => ethernet/amd}/declance.c | 0
drivers/net/{ => ethernet/amd}/depca.c | 0
drivers/net/{ => ethernet/amd}/depca.h | 0
drivers/net/{ => ethernet/amd}/hplance.c | 0
drivers/net/{ => ethernet/amd}/hplance.h | 0
drivers/net/{ => ethernet/amd}/lance.c | 0
drivers/net/{ => ethernet/amd}/mvme147.c | 0
drivers/net/{ => ethernet/amd}/ni65.c | 0
drivers/net/{ => ethernet/amd}/ni65.h | 0
drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 0
drivers/net/{ => ethernet/amd}/pcnet32.c | 0
drivers/net/{ => ethernet/amd}/sun3lance.c | 0
drivers/net/{ => ethernet/amd}/sunlance.c | 0
drivers/net/pcmcia/Kconfig | 9 -
drivers/net/pcmcia/Makefile | 1 -
37 files changed, 212 insertions(+), 187 deletions(-)
rename drivers/net/{ => ethernet/amd}/7990.c (100%)
rename drivers/net/{ => ethernet/amd}/7990.h (100%)
create mode 100644 drivers/net/ethernet/amd/Kconfig
create mode 100644 drivers/net/ethernet/amd/Makefile
rename drivers/net/{ => ethernet/amd}/a2065.c (100%)
rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
rename drivers/net/{arm => ethernet/amd}/am79c961a.c (100%)
rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
rename drivers/net/{ => ethernet/amd}/ariadne.c (100%)
rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
rename drivers/net/{ => ethernet/amd}/au1000_eth.c (100%)
rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
rename drivers/net/{ => ethernet/amd}/declance.c (100%)
rename drivers/net/{ => ethernet/amd}/depca.c (100%)
rename drivers/net/{ => ethernet/amd}/depca.h (100%)
rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
rename drivers/net/{ => ethernet/amd}/lance.c (100%)
rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
rename drivers/net/{ => ethernet/amd}/ni65.c (100%)
rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (100%)
rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f77c3ac..7a8711d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -740,7 +740,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>
@@ -4914,7 +4914,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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 17ef5c2..e446460 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -287,27 +287,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
@@ -387,16 +366,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
@@ -415,27 +384,6 @@ config BVME6000_NET
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
@@ -445,14 +393,6 @@ config SUN3_82586
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
@@ -487,15 +427,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
@@ -545,19 +476,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
@@ -616,18 +534,6 @@ config SUNVNET
help
Support for virtual network devices under Sun Logical Domains.
-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
@@ -963,17 +869,6 @@ config NI52
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
@@ -999,19 +894,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
@@ -1230,32 +1112,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
@@ -1777,15 +1633,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 || \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c8223a1..0e06b05 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -56,7 +56,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
@@ -67,7 +66,6 @@ obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.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
@@ -177,9 +175,7 @@ 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
@@ -191,12 +187,10 @@ 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_AC3200) += ac3200.o 8390.o
obj-$(CONFIG_APRICOT) += 82596.o
obj-$(CONFIG_LASI_82596) += lasi_82596.o
@@ -210,19 +204,12 @@ 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
@@ -232,7 +219,6 @@ 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/
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 39e1c0d..d0c8cf2 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -2,13 +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"
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 303171f..63c57be 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -3,7 +3,6 @@
# 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
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 18193ec..5e62efd 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,5 +12,6 @@ menuconfig ETHERNET
if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/amd/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 07766ba..1bc2ac2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -3,3 +3,4 @@
#
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
+obj-$(CONFIG_NET_VENDOR_AMD) += amd/
diff --git a/drivers/net/7990.c b/drivers/net/ethernet/amd/7990.c
similarity index 100%
rename from drivers/net/7990.c
rename to drivers/net/ethernet/amd/7990.c
diff --git a/drivers/net/7990.h b/drivers/net/ethernet/amd/7990.h
similarity index 100%
rename from drivers/net/7990.h
rename to 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 0000000..f53e5b9
--- /dev/null
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -0,0 +1,188 @@
+#
+# 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.
+
+config A2065
+ tristate "A2065 support"
+ depends on NET_VENDOR_AMD && 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 && NET_VENDOR_AMD
+ 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 && NET_VENDOR_AMD
+ ---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 && NET_VENDOR_AMD
+ 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 NET_VENDOR_AMD && 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 NET_VENDOR_AMD && 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 && NET_VENDOR_AMD
+ ---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 && NET_VENDOR_AMD
+ 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 NET_VENDOR_AMD && (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 && NET_VENDOR_AMD
+ 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 && NET_VENDOR_AMD
+ 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 NET_VENDOR_AMD && 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 NET_VENDOR_AMD && 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) && NET_VENDOR_AMD
+ ---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 && NET_VENDOR_AMD
+ 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.
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
new file mode 100644
index 0000000..175caa5
--- /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
similarity index 100%
rename from drivers/net/a2065.c
rename to drivers/net/ethernet/amd/a2065.c
diff --git a/drivers/net/a2065.h b/drivers/net/ethernet/amd/a2065.h
similarity index 100%
rename from drivers/net/a2065.h
rename to drivers/net/ethernet/amd/a2065.h
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
similarity index 100%
rename from drivers/net/arm/am79c961a.c
rename to drivers/net/ethernet/amd/am79c961a.c
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/ethernet/amd/am79c961a.h
similarity index 100%
rename from drivers/net/arm/am79c961a.h
rename to drivers/net/ethernet/amd/am79c961a.h
diff --git a/drivers/net/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
similarity index 100%
rename from drivers/net/amd8111e.c
rename to drivers/net/ethernet/amd/amd8111e.c
diff --git a/drivers/net/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h
similarity index 100%
rename from drivers/net/amd8111e.h
rename to drivers/net/ethernet/amd/amd8111e.h
diff --git a/drivers/net/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
similarity index 100%
rename from drivers/net/ariadne.c
rename to drivers/net/ethernet/amd/ariadne.c
diff --git a/drivers/net/ariadne.h b/drivers/net/ethernet/amd/ariadne.h
similarity index 100%
rename from drivers/net/ariadne.h
rename to drivers/net/ethernet/amd/ariadne.h
diff --git a/drivers/net/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
similarity index 100%
rename from drivers/net/atarilance.c
rename to drivers/net/ethernet/amd/atarilance.c
diff --git a/drivers/net/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
similarity index 100%
rename from drivers/net/au1000_eth.c
rename to drivers/net/ethernet/amd/au1000_eth.c
diff --git a/drivers/net/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h
similarity index 100%
rename from drivers/net/au1000_eth.h
rename to drivers/net/ethernet/amd/au1000_eth.h
diff --git a/drivers/net/declance.c b/drivers/net/ethernet/amd/declance.c
similarity index 100%
rename from drivers/net/declance.c
rename to drivers/net/ethernet/amd/declance.c
diff --git a/drivers/net/depca.c b/drivers/net/ethernet/amd/depca.c
similarity index 100%
rename from drivers/net/depca.c
rename to drivers/net/ethernet/amd/depca.c
diff --git a/drivers/net/depca.h b/drivers/net/ethernet/amd/depca.h
similarity index 100%
rename from drivers/net/depca.h
rename to drivers/net/ethernet/amd/depca.h
diff --git a/drivers/net/hplance.c b/drivers/net/ethernet/amd/hplance.c
similarity index 100%
rename from drivers/net/hplance.c
rename to drivers/net/ethernet/amd/hplance.c
diff --git a/drivers/net/hplance.h b/drivers/net/ethernet/amd/hplance.h
similarity index 100%
rename from drivers/net/hplance.h
rename to drivers/net/ethernet/amd/hplance.h
diff --git a/drivers/net/lance.c b/drivers/net/ethernet/amd/lance.c
similarity index 100%
rename from drivers/net/lance.c
rename to drivers/net/ethernet/amd/lance.c
diff --git a/drivers/net/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
similarity index 100%
rename from drivers/net/mvme147.c
rename to drivers/net/ethernet/amd/mvme147.c
diff --git a/drivers/net/ni65.c b/drivers/net/ethernet/amd/ni65.c
similarity index 100%
rename from drivers/net/ni65.c
rename to drivers/net/ethernet/amd/ni65.c
diff --git a/drivers/net/ni65.h b/drivers/net/ethernet/amd/ni65.h
similarity index 100%
rename from drivers/net/ni65.h
rename to drivers/net/ethernet/amd/ni65.h
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
similarity index 100%
rename from drivers/net/pcmcia/nmclan_cs.c
rename to drivers/net/ethernet/amd/nmclan_cs.c
diff --git a/drivers/net/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
similarity index 100%
rename from drivers/net/pcnet32.c
rename to drivers/net/ethernet/amd/pcnet32.c
diff --git a/drivers/net/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
similarity index 100%
rename from drivers/net/sun3lance.c
rename to drivers/net/ethernet/amd/sun3lance.c
diff --git a/drivers/net/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
similarity index 100%
rename from drivers/net/sunlance.c
rename to drivers/net/ethernet/amd/sunlance.c
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index b67c5ed..e17ad95 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -41,15 +41,6 @@ config PCMCIA_PCNET
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
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 2f2ab3b..985f0ae 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -4,7 +4,6 @@
# 16-bit client drivers
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
--
1.7.6
^ permalink raw reply related
* [net-next v2 05/71] broadcom: Move the Broadcom drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Eilon Greenstein,
Michael Chan, Matt Carlson, Gary Zambrano, Maciej W. Rozycki
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the drivers for Broadcom devices into
drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
changes.
CC: Eilon Greenstein <eilong@broadcom.com>
CC: Michael Chan <mchan@broadcom.com>
CC: Matt Carlson <mcarlson@broadcom.com>
CC: Gary Zambrano <zambrano@broadcom.com>
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 10 +-
drivers/net/Kconfig | 99 -----------------
drivers/net/Makefile | 7 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/broadcom/Kconfig | 114 ++++++++++++++++++++
drivers/net/ethernet/broadcom/Makefile | 11 ++
drivers/net/{ => ethernet/broadcom}/b44.c | 0
drivers/net/{ => ethernet/broadcom}/b44.h | 0
drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
.../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 0
.../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
.../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
drivers/net/{ => ethernet/broadcom}/cnic.h | 0
drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
drivers/net/{ => ethernet/broadcom}/tg3.c | 0
drivers/net/{ => ethernet/broadcom}/tg3.h | 0
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2i/bnx2i.h | 2 +-
44 files changed, 136 insertions(+), 115 deletions(-)
create mode 100644 drivers/net/ethernet/broadcom/Kconfig
create mode 100644 drivers/net/ethernet/broadcom/Makefile
rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e7fea16..db0a832 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1520,27 +1520,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/bnx2_*
+F: drivers/net/ethernet/broadcom/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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 077085d..d08a05f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -940,38 +940,6 @@ config APRICOT
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
@@ -1408,15 +1376,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
@@ -1626,19 +1585,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
@@ -1732,39 +1678,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)
@@ -2270,18 +2183,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9861f6f..491127f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -77,10 +77,6 @@ obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.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,10 +113,7 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
endif
-obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
-obj-$(CONFIG_B44) += b44.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
obj-$(CONFIG_FTGMAC100) += ftgmac100.o
obj-$(CONFIG_FTMAC100) += ftmac100.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 56ed5ec..772fb49 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,5 +14,6 @@ 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"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index fc82588..3ef49a2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,3 +5,4 @@
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
new file mode 100644
index 0000000..55fd2cf
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -0,0 +1,114 @@
+#
+# 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.
+
+config B44
+ tristate "Broadcom 440x/47xx ethernet support"
+ depends on NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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 NET_VENDOR_BROADCOM && 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.
diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile
new file mode 100644
index 0000000..b789605
--- /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
similarity index 100%
rename from drivers/net/b44.c
rename to drivers/net/ethernet/broadcom/b44.c
diff --git a/drivers/net/b44.h b/drivers/net/ethernet/broadcom/b44.h
similarity index 100%
rename from drivers/net/b44.h
rename to drivers/net/ethernet/broadcom/b44.h
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
similarity index 100%
rename from drivers/net/bcm63xx_enet.c
rename to drivers/net/ethernet/broadcom/bcm63xx_enet.c
diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
similarity index 100%
rename from drivers/net/bcm63xx_enet.h
rename to drivers/net/ethernet/broadcom/bcm63xx_enet.h
diff --git a/drivers/net/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
similarity index 100%
rename from drivers/net/bnx2.c
rename to drivers/net/ethernet/broadcom/bnx2.c
diff --git a/drivers/net/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
similarity index 100%
rename from drivers/net/bnx2.h
rename to drivers/net/ethernet/broadcom/bnx2.h
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h
similarity index 100%
rename from drivers/net/bnx2_fw.h
rename to drivers/net/ethernet/broadcom/bnx2_fw.h
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile
similarity index 100%
rename from drivers/net/bnx2x/Makefile
rename to drivers/net/ethernet/broadcom/bnx2x/Makefile
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
similarity index 100%
rename from drivers/net/bnx2x/bnx2x.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_cmn.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_cmn.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dcb.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dcb.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dump.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_fw_defs.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_fw_file_hdr.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_hsi.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_init.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_init_ops.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_link.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_link.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_main.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_reg.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_sp.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_sp.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_stats.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_stats.h
rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
diff --git a/drivers/net/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
similarity index 99%
rename from drivers/net/cnic.c
rename to drivers/net/ethernet/broadcom/cnic.c
index 94a2e54..7698161 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_hsi.h"
+#include "../../../scsi/bnx2i/57xx_iscsi_constants.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
similarity index 100%
rename from drivers/net/cnic.h
rename to drivers/net/ethernet/broadcom/cnic.h
diff --git a/drivers/net/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
similarity index 100%
rename from drivers/net/cnic_defs.h
rename to drivers/net/ethernet/broadcom/cnic_defs.h
diff --git a/drivers/net/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
similarity index 100%
rename from drivers/net/cnic_if.h
rename to drivers/net/ethernet/broadcom/cnic_if.h
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
similarity index 100%
rename from drivers/net/sb1250-mac.c
rename to drivers/net/ethernet/broadcom/sb1250-mac.c
diff --git a/drivers/net/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
similarity index 100%
rename from drivers/net/tg3.c
rename to drivers/net/ethernet/broadcom/tg3.c
diff --git a/drivers/net/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
similarity index 100%
rename from drivers/net/tg3.h
rename to drivers/net/ethernet/broadcom/tg3.h
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index d924236..5ce7cb5 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 dc57007..0bd70e8 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"
--
1.7.6
^ permalink raw reply related
* [net-next v2 06/71] chelsio: Move the Chelsio drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Divy Le Ray,
Dimitris Michailidis, Casey Leedom
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the drivers for the Chelsio chipsets into
drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
changes.
CC: Divy Le Ray <divy@chelsio.com>
CC: Dimitris Michailidis <dm@chelsio.com>
CC: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 6 +-
drivers/infiniband/hw/cxgb3/Makefile | 2 +-
drivers/infiniband/hw/cxgb4/Makefile | 2 +-
drivers/net/Kconfig | 86 ----------------
drivers/net/Makefile | 4 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/chelsio/Kconfig | 102 ++++++++++++++++++++
drivers/net/ethernet/chelsio/Makefile | 8 ++
.../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
.../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
.../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
.../chelsio/cxgb}/suni1x10gexp_regs.h | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
.../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
.../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
.../chelsio/cxgb}/vsc7326_reg.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
.../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
.../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
.../chelsio}/cxgb3/firmware_exports.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
.../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
.../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
.../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
.../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
.../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
.../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
.../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
78 files changed, 119 insertions(+), 97 deletions(-)
create mode 100644 drivers/net/ethernet/chelsio/Kconfig
create mode 100644 drivers/net/ethernet/chelsio/Makefile
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index db0a832..9e9cac8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1981,7 +1981,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>
@@ -1995,7 +1995,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>
@@ -2009,7 +2009,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>
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
index 621619c..2761364 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 cd20b13..46b878c 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 d08a05f..2d9a577 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1885,92 +1885,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 491127f..9b1b3a7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,10 +19,6 @@ 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/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 772fb49..69d6403 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,5 +15,6 @@ 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"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3ef49a2..470e5d8 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,3 +6,4 @@ 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/
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
new file mode 100644
index 0000000..24fd964
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/Kconfig
@@ -0,0 +1,102 @@
+#
+# 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.
+
+config CHELSIO_T1
+ tristate "Chelsio 10Gb Ethernet support"
+ depends on NET_VENDOR_CHELSIO && 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 NET_VENDOR_CHELSIO && 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 NET_VENDOR_CHELSIO && 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 NET_VENDOR_CHELSIO && 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.
diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile
new file mode 100644
index 0000000..390510b
--- /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
similarity index 100%
rename from drivers/net/chelsio/Makefile
rename to drivers/net/ethernet/chelsio/cxgb/Makefile
diff --git a/drivers/net/chelsio/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h
similarity index 100%
rename from drivers/net/chelsio/common.h
rename to drivers/net/ethernet/chelsio/cxgb/common.h
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/ethernet/chelsio/cxgb/cphy.h
similarity index 100%
rename from drivers/net/chelsio/cphy.h
rename to 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
similarity index 100%
rename from drivers/net/chelsio/cpl5_cmd.h
rename to drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
similarity index 100%
rename from drivers/net/chelsio/cxgb2.c
rename to drivers/net/ethernet/chelsio/cxgb/cxgb2.c
diff --git a/drivers/net/chelsio/elmer0.h b/drivers/net/ethernet/chelsio/cxgb/elmer0.h
similarity index 100%
rename from drivers/net/chelsio/elmer0.h
rename to drivers/net/ethernet/chelsio/cxgb/elmer0.h
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c
similarity index 100%
rename from drivers/net/chelsio/espi.c
rename to drivers/net/ethernet/chelsio/cxgb/espi.c
diff --git a/drivers/net/chelsio/espi.h b/drivers/net/ethernet/chelsio/cxgb/espi.h
similarity index 100%
rename from drivers/net/chelsio/espi.h
rename to 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
similarity index 100%
rename from drivers/net/chelsio/fpga_defs.h
rename to drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/ethernet/chelsio/cxgb/gmac.h
similarity index 100%
rename from drivers/net/chelsio/gmac.h
rename to drivers/net/ethernet/chelsio/cxgb/gmac.h
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
similarity index 100%
rename from drivers/net/chelsio/mv88e1xxx.c
rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
diff --git a/drivers/net/chelsio/mv88e1xxx.h b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
similarity index 100%
rename from drivers/net/chelsio/mv88e1xxx.h
rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
similarity index 100%
rename from drivers/net/chelsio/mv88x201x.c
rename to drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c
similarity index 100%
rename from drivers/net/chelsio/my3126.c
rename to drivers/net/ethernet/chelsio/cxgb/my3126.c
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/ethernet/chelsio/cxgb/pm3393.c
similarity index 100%
rename from drivers/net/chelsio/pm3393.c
rename to drivers/net/ethernet/chelsio/cxgb/pm3393.c
diff --git a/drivers/net/chelsio/regs.h b/drivers/net/ethernet/chelsio/cxgb/regs.h
similarity index 100%
rename from drivers/net/chelsio/regs.h
rename to drivers/net/ethernet/chelsio/cxgb/regs.h
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
similarity index 100%
rename from drivers/net/chelsio/sge.c
rename to drivers/net/ethernet/chelsio/cxgb/sge.c
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h
similarity index 100%
rename from drivers/net/chelsio/sge.h
rename to drivers/net/ethernet/chelsio/cxgb/sge.h
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c
similarity index 100%
rename from drivers/net/chelsio/subr.c
rename to 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
similarity index 100%
rename from drivers/net/chelsio/suni1x10gexp_regs.h
rename to drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
diff --git a/drivers/net/chelsio/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c
similarity index 100%
rename from drivers/net/chelsio/tp.c
rename to drivers/net/ethernet/chelsio/cxgb/tp.c
diff --git a/drivers/net/chelsio/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h
similarity index 100%
rename from drivers/net/chelsio/tp.h
rename to drivers/net/ethernet/chelsio/cxgb/tp.h
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
similarity index 100%
rename from drivers/net/chelsio/vsc7326.c
rename to 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
similarity index 100%
rename from drivers/net/chelsio/vsc7326_reg.h
rename to drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
diff --git a/drivers/net/cxgb3/Makefile b/drivers/net/ethernet/chelsio/cxgb3/Makefile
similarity index 100%
rename from drivers/net/cxgb3/Makefile
rename to drivers/net/ethernet/chelsio/cxgb3/Makefile
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
similarity index 100%
rename from drivers/net/cxgb3/adapter.h
rename to drivers/net/ethernet/chelsio/cxgb3/adapter.h
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
similarity index 100%
rename from drivers/net/cxgb3/ael1002.c
rename to drivers/net/ethernet/chelsio/cxgb3/ael1002.c
diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/ethernet/chelsio/cxgb3/aq100x.c
similarity index 100%
rename from drivers/net/cxgb3/aq100x.c
rename to drivers/net/ethernet/chelsio/cxgb3/aq100x.c
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h
similarity index 100%
rename from drivers/net/cxgb3/common.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_ctl_defs.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_defs.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_ioctl.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_main.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_offload.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_offload.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/firmware_exports.h
rename to drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
similarity index 100%
rename from drivers/net/cxgb3/l2t.c
rename to drivers/net/ethernet/chelsio/cxgb3/l2t.c
diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
similarity index 100%
rename from drivers/net/cxgb3/l2t.h
rename to drivers/net/ethernet/chelsio/cxgb3/l2t.h
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/ethernet/chelsio/cxgb3/mc5.c
similarity index 100%
rename from drivers/net/cxgb3/mc5.c
rename to drivers/net/ethernet/chelsio/cxgb3/mc5.c
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h
similarity index 100%
rename from drivers/net/cxgb3/regs.h
rename to drivers/net/ethernet/chelsio/cxgb3/regs.h
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
similarity index 100%
rename from drivers/net/cxgb3/sge.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/sge_defs.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/t3_cpl.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb3/t3_hw.c
rename to drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
similarity index 100%
rename from drivers/net/cxgb3/t3cdev.h
rename to drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h
similarity index 100%
rename from drivers/net/cxgb3/version.h
rename to drivers/net/ethernet/chelsio/cxgb3/version.h
diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
similarity index 100%
rename from drivers/net/cxgb3/vsc8211.c
rename to drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
similarity index 100%
rename from drivers/net/cxgb3/xgmac.c
rename to drivers/net/ethernet/chelsio/cxgb3/xgmac.c
diff --git a/drivers/net/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile
similarity index 100%
rename from drivers/net/cxgb4/Makefile
rename to drivers/net/ethernet/chelsio/cxgb4/Makefile
diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
similarity index 100%
rename from drivers/net/cxgb4/cxgb4.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/cxgb4_main.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/cxgb4_uld.h
rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
diff --git a/drivers/net/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
similarity index 100%
rename from drivers/net/cxgb4/l2t.c
rename to drivers/net/ethernet/chelsio/cxgb4/l2t.c
diff --git a/drivers/net/cxgb4/l2t.h b/drivers/net/ethernet/chelsio/cxgb4/l2t.h
similarity index 100%
rename from drivers/net/cxgb4/l2t.h
rename to drivers/net/ethernet/chelsio/cxgb4/l2t.h
diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
similarity index 100%
rename from drivers/net/cxgb4/sge.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/t4_hw.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/t4_hw.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/t4_msg.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/t4_regs.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4/t4fw_api.h
rename to drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
diff --git a/drivers/net/cxgb4vf/Makefile b/drivers/net/ethernet/chelsio/cxgb4vf/Makefile
similarity index 100%
rename from drivers/net/cxgb4vf/Makefile
rename to drivers/net/ethernet/chelsio/cxgb4vf/Makefile
diff --git a/drivers/net/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
similarity index 100%
rename from drivers/net/cxgb4vf/adapter.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4vf/cxgb4vf_main.c
rename to drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
similarity index 100%
rename from drivers/net/cxgb4vf/sge.c
rename to 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
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_common.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_defs.h
rename to 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
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_hw.c
rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild
index 09dbf9e..6f095e2 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 b9f4af7..8290cda 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
--
1.7.6
^ permalink raw reply related
* [net-next v2 07/71] intel: Move the Intel wired LAN drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 11 +-
drivers/net/Kconfig | 200 ------------------
drivers/net/Makefile | 8 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/intel/Kconfig | 216 ++++++++++++++++++++
drivers/net/ethernet/intel/Makefile | 12 +
drivers/net/{ => ethernet/intel}/e100.c | 0
drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
.../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
.../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
.../intel/e1000e/80003es2lan.c} | 0
drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
drivers/net/{ => ethernet/intel}/igb/Makefile | 0
drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
.../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
drivers/net/{ => ethernet/intel}/igb/igb.h | 0
drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
.../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
.../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
.../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
.../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
101 files changed, 233 insertions(+), 218 deletions(-)
create mode 100644 drivers/net/ethernet/intel/Kconfig
create mode 100644 drivers/net/ethernet/intel/Makefile
rename drivers/net/{ => ethernet/intel}/e100.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9e9cac8..d497be8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3328,7 +3328,7 @@ 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
@@ -3344,14 +3344,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/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/
+F: drivers/net/ethernet/intel/
INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
L: linux-wireless@vger.kernel.org
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2d9a577..2311dc2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -975,32 +975,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 FEALNX
tristate "Myson MTD-8xx PCI Ethernet support"
depends on NET_PCI && PCI
@@ -1433,47 +1407,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
@@ -1484,57 +1417,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
@@ -1901,88 +1783,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9b1b3a7..f9c9789 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -10,14 +10,7 @@ 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_EHEA) += ehea/
obj-$(CONFIG_CAN) += can/
@@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_E100) += e100.o
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_EPIC100) += epic100.o
obj-$(CONFIG_SMSC9420) += smsc9420.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 69d6403..a2fd385 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -16,5 +16,6 @@ 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"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 470e5d8..5265271 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,3 +7,4 @@ 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/
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
new file mode 100644
index 0000000..83089e4
--- /dev/null
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -0,0 +1,216 @@
+#
+# 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.
+
+config E100
+ tristate "Intel(R) PRO/100+ support"
+ depends on NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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 NET_VENDOR_INTEL && 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.
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
new file mode 100644
index 0000000..c8210e6
--- /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
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/ethernet/intel/e100.c
diff --git a/drivers/net/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile
similarity index 100%
rename from drivers/net/e1000/Makefile
rename to drivers/net/ethernet/intel/e1000/Makefile
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
similarity index 100%
rename from drivers/net/e1000/e1000.h
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_hw.h
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_main.c
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h
rename to 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
similarity index 100%
rename from drivers/net/e1000/e1000_param.c
rename to drivers/net/ethernet/intel/e1000/e1000_param.c
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
similarity index 100%
rename from drivers/net/e1000e/es2lan.c
rename to drivers/net/ethernet/intel/e1000e/80003es2lan.c
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
similarity index 100%
rename from drivers/net/e1000e/82571.c
rename to drivers/net/ethernet/intel/e1000e/82571.c
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
similarity index 96%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/ethernet/intel/e1000e/Makefile
index 28519ac..948c05d 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
similarity index 100%
rename from drivers/net/e1000e/defines.h
rename to drivers/net/ethernet/intel/e1000e/defines.h
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
similarity index 100%
rename from drivers/net/e1000e/e1000.h
rename to drivers/net/ethernet/intel/e1000e/e1000.h
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
similarity index 100%
rename from drivers/net/e1000e/ethtool.c
rename to drivers/net/ethernet/intel/e1000e/ethtool.c
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/ethernet/intel/e1000e/hw.h
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
similarity index 100%
rename from drivers/net/e1000e/ich8lan.c
rename to drivers/net/ethernet/intel/e1000e/ich8lan.c
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
similarity index 100%
rename from drivers/net/e1000e/lib.c
rename to drivers/net/ethernet/intel/e1000e/lib.c
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
similarity index 100%
rename from drivers/net/e1000e/netdev.c
rename to drivers/net/ethernet/intel/e1000e/netdev.c
diff --git a/drivers/net/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
similarity index 100%
rename from drivers/net/e1000e/param.c
rename to drivers/net/ethernet/intel/e1000e/param.c
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
similarity index 100%
rename from drivers/net/e1000e/phy.c
rename to drivers/net/ethernet/intel/e1000e/phy.c
diff --git a/drivers/net/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
similarity index 100%
rename from drivers/net/igb/Makefile
rename to drivers/net/ethernet/intel/igb/Makefile
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
similarity index 100%
rename from drivers/net/igb/e1000_82575.c
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_82575.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_defines.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_hw.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_mac.c
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_mac.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_mbx.c
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_mbx.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_nvm.c
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_nvm.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_phy.c
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_phy.h
rename to 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
similarity index 100%
rename from drivers/net/igb/e1000_regs.h
rename to drivers/net/ethernet/intel/igb/e1000_regs.h
diff --git a/drivers/net/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
similarity index 100%
rename from drivers/net/igb/igb.h
rename to 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
similarity index 100%
rename from drivers/net/igb/igb_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/igb/igb_main.c
rename to drivers/net/ethernet/intel/igb/igb_main.c
diff --git a/drivers/net/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
similarity index 100%
rename from drivers/net/igbvf/Makefile
rename to drivers/net/ethernet/intel/igbvf/Makefile
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
similarity index 100%
rename from drivers/net/igbvf/defines.h
rename to drivers/net/ethernet/intel/igbvf/defines.h
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
similarity index 100%
rename from drivers/net/igbvf/ethtool.c
rename to drivers/net/ethernet/intel/igbvf/ethtool.c
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
similarity index 100%
rename from drivers/net/igbvf/igbvf.h
rename to drivers/net/ethernet/intel/igbvf/igbvf.h
diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/ethernet/intel/igbvf/mbx.c
diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/ethernet/intel/igbvf/mbx.h
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
similarity index 100%
rename from drivers/net/igbvf/netdev.c
rename to drivers/net/ethernet/intel/igbvf/netdev.c
diff --git a/drivers/net/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h
similarity index 100%
rename from drivers/net/igbvf/regs.h
rename to drivers/net/ethernet/intel/igbvf/regs.h
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/ethernet/intel/igbvf/vf.c
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/ethernet/intel/igbvf/vf.h
diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile
similarity index 100%
rename from drivers/net/ixgb/Makefile
rename to drivers/net/ethernet/intel/ixgb/Makefile
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h
rename to 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
similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_param.c
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
similarity index 100%
rename from drivers/net/ixgbe/Makefile
rename to drivers/net/ethernet/intel/ixgbe/Makefile
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_x540.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
diff --git a/drivers/net/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
similarity index 100%
rename from drivers/net/ixgbevf/Makefile
rename to drivers/net/ethernet/intel/ixgbevf/Makefile
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
similarity index 100%
rename from drivers/net/ixgbevf/defines.h
rename to drivers/net/ethernet/intel/ixgbevf/defines.h
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c
rename to drivers/net/ethernet/intel/ixgbevf/ethtool.c
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h
rename to 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
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c
rename to drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
diff --git a/drivers/net/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
similarity index 100%
rename from drivers/net/ixgbevf/mbx.c
rename to drivers/net/ethernet/intel/ixgbevf/mbx.c
diff --git a/drivers/net/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h
similarity index 100%
rename from drivers/net/ixgbevf/mbx.h
rename to drivers/net/ethernet/intel/ixgbevf/mbx.h
diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
similarity index 100%
rename from drivers/net/ixgbevf/regs.h
rename to drivers/net/ethernet/intel/ixgbevf/regs.h
diff --git a/drivers/net/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
similarity index 100%
rename from drivers/net/ixgbevf/vf.c
rename to drivers/net/ethernet/intel/ixgbevf/vf.c
diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
similarity index 100%
rename from drivers/net/ixgbevf/vf.h
rename to drivers/net/ethernet/intel/ixgbevf/vf.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 08/71] qlogic: Move the QLogic drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Ron Mercer,
Amit Kumar Salecha, Anirban Chakraborty
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
the necessary Kconfig and Makefile changes.
CC: Ron Mercer <ron.mercer@qlogic.com>
CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
---
MAINTAINERS | 8 ++--
drivers/net/Kconfig | 26 ----------
drivers/net/Makefile | 3 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/qlogic/Kconfig | 49 ++++++++++++++++++++
drivers/net/ethernet/qlogic/Makefile | 8 +++
drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
.../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
.../qlogic}/netxen/netxen_nic_ethtool.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
.../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
.../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
.../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
.../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
32 files changed, 63 insertions(+), 33 deletions(-)
create mode 100644 drivers/net/ethernet/qlogic/Kconfig
create mode 100644 drivers/net/ethernet/qlogic/Makefile
rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%)
rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index d497be8..eb35265 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4473,7 +4473,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>
@@ -5207,7 +5207,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>
@@ -5215,7 +5215,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>
@@ -5223,7 +5223,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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2311dc2..8879506 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1650,15 +1650,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
@@ -1897,23 +1888,6 @@ config TEHUTI
help
Tehuti Networks 10G Ethernet NIC
-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 f9c9789..8e41978 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -110,9 +110,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
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index a2fd385..ab591bb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,5 +17,6 @@ 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/qlogic/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 5265271..d8cf120 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,3 +8,4 @@ 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_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
new file mode 100644
index 0000000..07f088a
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -0,0 +1,49 @@
+#
+# 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.
+
+config QLA3XXX
+ tristate "QLogic QLA3XXX Network Driver Support"
+ depends on NET_VENDOR_QLOGIC && 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 NET_VENDOR_QLOGIC && 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 NET_VENDOR_QLOGIC && 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 NET_VENDOR_QLOGIC && PCI
+ select FW_LOADER
+ ---help---
+ This enables the support for NetXen's Gigabit Ethernet card.
diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile
new file mode 100644
index 0000000..b2a283d
--- /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
similarity index 100%
rename from drivers/net/netxen/Makefile
rename to drivers/net/ethernet/qlogic/netxen/Makefile
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
similarity index 100%
rename from drivers/net/netxen/netxen_nic.h
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_ctx.c
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hdr.h
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hw.c
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hw.h
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_init.c
rename to 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
similarity index 100%
rename from drivers/net/netxen/netxen_nic_main.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
diff --git a/drivers/net/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
similarity index 100%
rename from drivers/net/qla3xxx.c
rename to drivers/net/ethernet/qlogic/qla3xxx.c
diff --git a/drivers/net/qla3xxx.h b/drivers/net/ethernet/qlogic/qla3xxx.h
similarity index 100%
rename from drivers/net/qla3xxx.h
rename to drivers/net/ethernet/qlogic/qla3xxx.h
diff --git a/drivers/net/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile
similarity index 100%
rename from drivers/net/qlcnic/Makefile
rename to drivers/net/ethernet/qlogic/qlcnic/Makefile
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
similarity index 100%
rename from drivers/net/qlcnic/qlcnic.h
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_ctx.c
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_hdr.h
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_hw.c
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_init.c
rename to 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
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_main.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
diff --git a/drivers/net/qlge/Makefile b/drivers/net/ethernet/qlogic/qlge/Makefile
similarity index 100%
rename from drivers/net/qlge/Makefile
rename to drivers/net/ethernet/qlogic/qlge/Makefile
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
similarity index 100%
rename from drivers/net/qlge/qlge.h
rename to 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
similarity index 100%
rename from drivers/net/qlge/qlge_dbg.c
rename to 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
similarity index 100%
rename from drivers/net/qlge/qlge_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/qlge/qlge_main.c
rename to 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
similarity index 100%
rename from drivers/net/qlge/qlge_mpi.c
rename to drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 09/71] smsc: Move the SMC (SMSC) drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Nicolas Pitre,
Donald Becker, Erik Stahlman, Dustin McIntire, Steve Glendinning,
David Hinds
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the
necessary Kconfig and Makefile changes. Also did some cleanup
of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
CC: Nicolas Pitre <nico@fluxnic.net>
CC: Donald Becker <becker@scyld.com>
CC: Erik Stahlman <erik@vt.edu>
CC: Dustin McIntire <dustin@sensoria.com>
CC: Steve Glendinning <steve.glendinning@smsc.com>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 6 +-
drivers/net/Kconfig | 105 ----------------
drivers/net/Makefile | 7 -
drivers/net/ethernet/8390/Kconfig | 21 +---
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/smsc/Kconfig | 128 ++++++++++++++++++++
drivers/net/ethernet/smsc/Makefile | 11 ++
drivers/net/{ => ethernet/smsc}/epic100.c | 0
drivers/net/{ => ethernet/smsc}/smc911x.c | 0
drivers/net/{ => ethernet/smsc}/smc911x.h | 0
drivers/net/{ => ethernet/smsc}/smc9194.c | 0
drivers/net/{ => ethernet/smsc}/smc9194.h | 0
.../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 0
drivers/net/{ => ethernet/smsc}/smc91x.c | 0
drivers/net/{ => ethernet/smsc}/smc91x.h | 0
drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
drivers/net/pcmcia/Kconfig | 11 --
drivers/net/pcmcia/Makefile | 1 -
22 files changed, 148 insertions(+), 144 deletions(-)
create mode 100644 drivers/net/ethernet/smsc/Kconfig
create mode 100644 drivers/net/ethernet/smsc/Makefile
rename drivers/net/{ => ethernet/smsc}/epic100.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smc9194.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc91x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%)
rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index eb35265..31c76f4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5831,7 +5831,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>
@@ -5866,13 +5866,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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8879506..c0aa2e3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -508,39 +508,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
@@ -655,44 +622,6 @@ 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
@@ -1091,33 +1020,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
@@ -1834,13 +1736,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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8e41978..4dfa35c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,8 +55,6 @@ obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.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
@@ -95,7 +93,6 @@ obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_SEEQ8005) += seeq8005.o
obj-$(CONFIG_NET_SB1000) += sb1000.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)
@@ -178,9 +175,6 @@ 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
@@ -227,7 +221,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/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index 072c641..1c48e4f 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -262,22 +262,9 @@ config STNIC
If unsure, say N.
-config NET_VENDOR_SMC
- bool "Western Digital/SMC cards"
- depends on NET_VENDOR_8390 && (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 ULTRAMCA
tristate "SMC Ultra MCA support"
- depends on NET_VENDOR_SMC && MCA
+ depends on NET_VENDOR_8390 && MCA
select CRC32
---help---
If you have a network (Ethernet) card of this type and are running
@@ -289,7 +276,7 @@ config ULTRAMCA
config ULTRA
tristate "SMC Ultra support"
- depends on NET_VENDOR_SMC && ISA
+ depends on NET_VENDOR_8390 && ISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read
@@ -308,7 +295,7 @@ config ULTRA
config ULTRA32
tristate "SMC Ultra32 EISA support"
- depends on NET_VENDOR_SMC && EISA
+ depends on NET_VENDOR_8390 && EISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read
@@ -320,7 +307,7 @@ config ULTRA32
config WD80x3
tristate "WD80*3 support"
- depends on NET_VENDOR_SMC && ISA
+ depends on NET_VENDOR_8390 && ISA
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y and read
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ab591bb..ed5836c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,5 +18,6 @@ source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/intel/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
index d8cf120..983fd27 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
new file mode 100644
index 0000000..dbb3069
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -0,0 +1,128 @@
+#
+# 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.
+
+config SMC9194
+ tristate "SMC 9194 support"
+ depends on NET_VENDOR_SMSC && (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 NET_VENDOR_SMSC && (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 NET_VENDOR_SMSC && 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 NET_VENDOR_SMSC && 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 NET_VENDOR_SMSC && (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 NET_VENDOR_SMSC && (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 NET_VENDOR_SMSC && 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>
diff --git a/drivers/net/ethernet/smsc/Makefile b/drivers/net/ethernet/smsc/Makefile
new file mode 100644
index 0000000..f3438de
--- /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
similarity index 100%
rename from drivers/net/epic100.c
rename to drivers/net/ethernet/smsc/epic100.c
diff --git a/drivers/net/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
similarity index 100%
rename from drivers/net/smc911x.c
rename to drivers/net/ethernet/smsc/smc911x.c
diff --git a/drivers/net/smc911x.h b/drivers/net/ethernet/smsc/smc911x.h
similarity index 100%
rename from drivers/net/smc911x.h
rename to drivers/net/ethernet/smsc/smc911x.h
diff --git a/drivers/net/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c
similarity index 100%
rename from drivers/net/smc9194.c
rename to drivers/net/ethernet/smsc/smc9194.c
diff --git a/drivers/net/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h
similarity index 100%
rename from drivers/net/smc9194.h
rename to drivers/net/ethernet/smsc/smc9194.h
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
similarity index 100%
rename from drivers/net/pcmcia/smc91c92_cs.c
rename to drivers/net/ethernet/smsc/smc91c92_cs.c
diff --git a/drivers/net/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
similarity index 100%
rename from drivers/net/smc91x.c
rename to drivers/net/ethernet/smsc/smc91x.c
diff --git a/drivers/net/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
similarity index 100%
rename from drivers/net/smc91x.h
rename to drivers/net/ethernet/smsc/smc91x.h
diff --git a/drivers/net/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
similarity index 100%
rename from drivers/net/smsc911x.c
rename to drivers/net/ethernet/smsc/smsc911x.c
diff --git a/drivers/net/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
similarity index 100%
rename from drivers/net/smsc911x.h
rename to drivers/net/ethernet/smsc/smsc911x.h
diff --git a/drivers/net/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
similarity index 100%
rename from drivers/net/smsc9420.c
rename to drivers/net/ethernet/smsc/smsc9420.c
diff --git a/drivers/net/smsc9420.h b/drivers/net/ethernet/smsc/smsc9420.h
similarity index 100%
rename from drivers/net/smsc9420.h
rename to drivers/net/ethernet/smsc/smsc9420.h
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 72aa257..f5a738f 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -31,17 +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_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
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index c2b8b44..f9c9883 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -4,7 +4,6 @@
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
-obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o
obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
--
1.7.6
^ permalink raw reply related
* [net-next v2 10/71] i825xx: Move the Intel 82586/82593/82596 based drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Philip Blundell,
Russell King, aris, Donald Becker, Chris Beauregard,
Richard Procter, Andries Brouwer, M.Hipp, Richard Hirst,
Sam Creasey, Thomas Bogendoerfer
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the drivers that use the i82586/i82593/i82596 chipsets into
drivers/net/ethernet/i825xx/ and make the necessary Kconfig and
Makefile changes. There were 4 3Com drivers which were initially
moved into 3com/, which now reside in i825xx since they all used
the i82586 chip.
CC: Philip Blundell <philb@gnu.org>
CC: Russell King <linux@arm.linux.org.uk>
CC: <aris@cathedrallabs.org>
CC: Donald Becker <becker@scyld.com>
CC: Chris Beauregard <cpbeaure@undergrad.math.uwaterloo.ca>
CC: Richard Procter <rnp@paradise.net.nz>
CC: Andries Brouwer <aeb@cwi.nl>
CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
CC: Richard Hirst <richard@sleepie.demon.co.uk>
CC: Sam Creasey <sammy@oh.verio.com>
CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 6 +-
drivers/net/Kconfig | 110 +---------------
drivers/net/Makefile | 13 --
drivers/net/arm/Kconfig | 7 -
drivers/net/arm/Makefile | 1 -
drivers/net/ethernet/3com/Kconfig | 45 ------
drivers/net/ethernet/3com/Makefile | 6 +-
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/{3com => i825xx}/3c505.c | 0
drivers/net/ethernet/{3com => i825xx}/3c505.h | 0
drivers/net/ethernet/{3com => i825xx}/3c507.c | 0
drivers/net/ethernet/{3com => i825xx}/3c523.c | 0
drivers/net/ethernet/{3com => i825xx}/3c523.h | 0
drivers/net/ethernet/{3com => i825xx}/3c527.c | 0
drivers/net/ethernet/{3com => i825xx}/3c527.h | 0
drivers/net/{ => ethernet/i825xx}/82596.c | 0
drivers/net/ethernet/i825xx/Kconfig | 178 ++++++++++++++++++++++++
drivers/net/ethernet/i825xx/Makefile | 20 +++
drivers/net/{ => ethernet/i825xx}/eepro.c | 0
drivers/net/{ => ethernet/i825xx}/eexpress.c | 0
drivers/net/{ => ethernet/i825xx}/eexpress.h | 0
drivers/net/{arm => ethernet/i825xx}/ether1.c | 0
drivers/net/{arm => ethernet/i825xx}/ether1.h | 0
drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0
drivers/net/{ => ethernet/i825xx}/lib82596.c | 0
drivers/net/{ => ethernet/i825xx}/lp486e.c | 0
drivers/net/{ => ethernet/i825xx}/ni52.c | 0
drivers/net/{ => ethernet/i825xx}/ni52.h | 0
drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0
drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 0
drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0
drivers/net/{ => ethernet/i825xx}/znet.c | 0
33 files changed, 205 insertions(+), 183 deletions(-)
rename drivers/net/ethernet/{3com => i825xx}/3c505.c (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c505.h (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c507.c (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c523.c (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c523.h (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c527.c (100%)
rename drivers/net/ethernet/{3com => i825xx}/3c527.h (100%)
rename drivers/net/{ => ethernet/i825xx}/82596.c (100%)
create mode 100644 drivers/net/ethernet/i825xx/Kconfig
create mode 100644 drivers/net/ethernet/i825xx/Makefile
rename drivers/net/{ => ethernet/i825xx}/eepro.c (100%)
rename drivers/net/{ => ethernet/i825xx}/eexpress.c (100%)
rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
rename drivers/net/{arm => ethernet/i825xx}/ether1.c (100%)
rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/lib82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/lp486e.c (100%)
rename drivers/net/{ => ethernet/i825xx}/ni52.c (100%)
rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (100%)
rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
rename drivers/net/{ => ethernet/i825xx}/znet.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 31c76f4..b423be0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -117,7 +117,7 @@ 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/ethernet/3com/3c505*
+F: drivers/net/ethernet/i825xx/3c505*
3C59X NETWORK DRIVER
M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
@@ -1008,7 +1008,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
@@ -2497,7 +2497,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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c0aa2e3..d7d0b35 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -306,47 +306,6 @@ config MACMACE
say Y and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
-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 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 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
@@ -627,7 +586,7 @@ config NET_VENDOR_RACAL
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
@@ -647,17 +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 DNET
tristate "Dave ethernet support (DNET)"
depends on NET_ETHERNET && HAS_IOMEM
@@ -725,41 +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 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
@@ -771,16 +684,6 @@ config ETH16I
To compile this driver as a module, choose M here. The module
will be called eth16i.
-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
@@ -858,17 +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 FORCEDETH
tristate "nForce Ethernet support"
depends on NET_PCI && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4dfa35c..49b3e87 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -130,32 +130,19 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_SUN3_82586) += sun3_82586.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_IBMLANA) += ibmlana.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_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o
obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_NI52) += ni52.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_EQUALIZER) += eql.o
obj-$(CONFIG_KORINA) += korina.o
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 715bf2a..7848b5f 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -3,13 +3,6 @@
# These are for Acorn's Expansion card network interfaces
#
-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"
depends on ARM && ARCH_ACORN
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index f1e6150..6cca728 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -4,7 +4,6 @@
#
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/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 7cbeae7..4d51e5b 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -29,29 +29,6 @@ config EL1
To compile this driver as a module, choose M here. The module
will be called 3c501.
-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)
@@ -78,28 +55,6 @@ config 3C515
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 PCMCIA_3C574
tristate "3Com 3c574 PCMCIA support"
depends on NET_VENDOR_3COM && PCMCIA
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
index ba27c7e..6f241fe 100644
--- a/drivers/net/ethernet/3com/Makefile
+++ b/drivers/net/ethernet/3com/Makefile
@@ -3,14 +3,10 @@
#
obj-$(CONFIG_EL1) += 3c501.o
-obj-$(CONFIG_ELPLUS) += 3c505.o
-obj-$(CONFIG_EL16) += 3c507.o
obj-$(CONFIG_EL3) += 3c509.o
obj-$(CONFIG_3C515) += 3c515.o
-obj-$(CONFIG_ELMC) += 3c523.o
-obj-$(CONFIG_ELMC_II) += 3c527.o
-obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
+obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
obj-$(CONFIG_VORTEX) += 3c59x.o
obj-$(CONFIG_ACENIC) += acenic.o
obj-$(CONFIG_TYPHOON) += typhoon.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ed5836c..d0a8fa8 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,6 +17,7 @@ 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"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 983fd27..6d3276a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,5 +8,6 @@ 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/ethernet/3com/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
similarity index 100%
rename from drivers/net/ethernet/3com/3c505.c
rename to drivers/net/ethernet/i825xx/3c505.c
diff --git a/drivers/net/ethernet/3com/3c505.h b/drivers/net/ethernet/i825xx/3c505.h
similarity index 100%
rename from drivers/net/ethernet/3com/3c505.h
rename to drivers/net/ethernet/i825xx/3c505.h
diff --git a/drivers/net/ethernet/3com/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
similarity index 100%
rename from drivers/net/ethernet/3com/3c507.c
rename to drivers/net/ethernet/i825xx/3c507.c
diff --git a/drivers/net/ethernet/3com/3c523.c b/drivers/net/ethernet/i825xx/3c523.c
similarity index 100%
rename from drivers/net/ethernet/3com/3c523.c
rename to drivers/net/ethernet/i825xx/3c523.c
diff --git a/drivers/net/ethernet/3com/3c523.h b/drivers/net/ethernet/i825xx/3c523.h
similarity index 100%
rename from drivers/net/ethernet/3com/3c523.h
rename to drivers/net/ethernet/i825xx/3c523.h
diff --git a/drivers/net/ethernet/3com/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
similarity index 100%
rename from drivers/net/ethernet/3com/3c527.c
rename to drivers/net/ethernet/i825xx/3c527.c
diff --git a/drivers/net/ethernet/3com/3c527.h b/drivers/net/ethernet/i825xx/3c527.h
similarity index 100%
rename from drivers/net/ethernet/3com/3c527.h
rename to drivers/net/ethernet/i825xx/3c527.h
diff --git a/drivers/net/82596.c b/drivers/net/ethernet/i825xx/82596.c
similarity index 100%
rename from drivers/net/82596.c
rename to 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 0000000..e649be1
--- /dev/null
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -0,0 +1,178 @@
+#
+# 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.
+
+config ELPLUS
+ tristate "3c505 \"EtherLink Plus\" support"
+ depends on NET_VENDOR_I825XX && 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_I825XX && 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 NET_VENDOR_I825XX && 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_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX
+ ---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_VENDOR_I825XX
+ ---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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX
+ ---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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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 NET_VENDOR_I825XX && 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>.
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
new file mode 100644
index 0000000..f68a369
--- /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
similarity index 100%
rename from drivers/net/eepro.c
rename to drivers/net/ethernet/i825xx/eepro.c
diff --git a/drivers/net/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
similarity index 100%
rename from drivers/net/eexpress.c
rename to drivers/net/ethernet/i825xx/eexpress.c
diff --git a/drivers/net/eexpress.h b/drivers/net/ethernet/i825xx/eexpress.h
similarity index 100%
rename from drivers/net/eexpress.h
rename to drivers/net/ethernet/i825xx/eexpress.h
diff --git a/drivers/net/arm/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
similarity index 100%
rename from drivers/net/arm/ether1.c
rename to drivers/net/ethernet/i825xx/ether1.c
diff --git a/drivers/net/arm/ether1.h b/drivers/net/ethernet/i825xx/ether1.h
similarity index 100%
rename from drivers/net/arm/ether1.h
rename to drivers/net/ethernet/i825xx/ether1.h
diff --git a/drivers/net/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
similarity index 100%
rename from drivers/net/lasi_82596.c
rename to drivers/net/ethernet/i825xx/lasi_82596.c
diff --git a/drivers/net/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
similarity index 100%
rename from drivers/net/lib82596.c
rename to drivers/net/ethernet/i825xx/lib82596.c
diff --git a/drivers/net/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
similarity index 100%
rename from drivers/net/lp486e.c
rename to drivers/net/ethernet/i825xx/lp486e.c
diff --git a/drivers/net/ni52.c b/drivers/net/ethernet/i825xx/ni52.c
similarity index 100%
rename from drivers/net/ni52.c
rename to drivers/net/ethernet/i825xx/ni52.c
diff --git a/drivers/net/ni52.h b/drivers/net/ethernet/i825xx/ni52.h
similarity index 100%
rename from drivers/net/ni52.h
rename to drivers/net/ethernet/i825xx/ni52.h
diff --git a/drivers/net/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c
similarity index 100%
rename from drivers/net/sni_82596.c
rename to drivers/net/ethernet/i825xx/sni_82596.c
diff --git a/drivers/net/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
similarity index 100%
rename from drivers/net/sun3_82586.c
rename to drivers/net/ethernet/i825xx/sun3_82586.c
diff --git a/drivers/net/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h
similarity index 100%
rename from drivers/net/sun3_82586.h
rename to drivers/net/ethernet/i825xx/sun3_82586.h
diff --git a/drivers/net/znet.c b/drivers/net/ethernet/i825xx/znet.c
similarity index 100%
rename from drivers/net/znet.c
rename to drivers/net/ethernet/i825xx/znet.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 11/71] ni5010: Move the Racal-Interlan (Micom) driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Jan-Pascal van Best,
Andreas Mohr
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and
make the necessary Kconfig and Makefile changes.
CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
CC: Andreas Mohr <andi@lisas.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 25 -------------------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/racal/Kconfig | 28 ++++++++++++++++++++++++++++
drivers/net/ethernet/racal/Makefile | 5 +++++
drivers/net/{ => ethernet/racal}/ni5010.c | 0
drivers/net/{ => ethernet/racal}/ni5010.h | 0
9 files changed, 36 insertions(+), 27 deletions(-)
create mode 100644 drivers/net/ethernet/racal/Kconfig
create mode 100644 drivers/net/ethernet/racal/Makefile
rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b423be0..e922c04 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4494,7 +4494,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org>
M: Andreas Mohr <andi@lisas.de>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ni5010.*
+F: drivers/net/ethernet/racal/ni5010.*
NILFS2 FILESYSTEM
M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d7d0b35..b76de82 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -581,31 +581,6 @@ config GRETH
help
Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-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, 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 NI cards. If you say Y, you will be asked for
- your specific card in the following questions.
-
-config NI5010
- tristate "NI5010 support (EXPERIMENTAL)"
- depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
- ---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 is still
- experimental code.
-
- To compile this driver as a module, choose M here. The module
- will be called ni5010.
-
config DNET
tristate "Dave ethernet support (DNET)"
depends on NET_ETHERNET && HAS_IOMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 49b3e87..e641f70 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o
-obj-$(CONFIG_NI5010) += ni5010.o
obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_ETH16I) += eth16i.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d0a8fa8..7efbb7c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ 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/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6d3276a..86da8b8 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,4 +10,5 @@ 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_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
new file mode 100644
index 0000000..713c33e
--- /dev/null
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -0,0 +1,28 @@
+#
+# Racal-Interlan device configuration
+#
+
+config NET_VENDOR_RACAL
+ bool "Racal-Interlan (Micom) NI devices"
+ 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,
+ 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 NI cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config NI5010
+ tristate "NI5010 support (EXPERIMENTAL)"
+ depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
+ ---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 is still
+ experimental code.
+
+ To compile this driver as a module, choose M here. The module
+ will be called ni5010.
diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile
new file mode 100644
index 0000000..1e210ca
--- /dev/null
+++ b/drivers/net/ethernet/racal/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Racal-Interlan network device drivers.
+#
+
+obj-$(CONFIG_NI5010) += ni5010.o
diff --git a/drivers/net/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
similarity index 100%
rename from drivers/net/ni5010.c
rename to drivers/net/ethernet/racal/ni5010.c
diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
similarity index 100%
rename from drivers/net/ni5010.h
rename to drivers/net/ethernet/racal/ni5010.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 12/71] cassini/niu/sun*: Move the Sun drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Sam Creasey, Adrian Sun,
Benjamin Herrenscmidt
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Sun drivers into drivers/net/ethernet/sun/ and make
the necessary Kconfig and Makefile changes.
Oliver Hartkopp <socketcan@hartkopp.net> suggested removing the
sun* prefix on the driver names. This type of change I will
leave up to the driver maintainers.
CC: Sam Creasey <sammy@sammy.net>
CC: Adrian Sun <asun@darksunrising.com>
CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 1 +
drivers/net/Kconfig | 66 ---------------------
drivers/net/Makefile | 10 +---
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/sun/Kconfig | 82 +++++++++++++++++++++++++++
drivers/net/ethernet/sun/Makefile | 11 ++++
drivers/net/{ => ethernet/sun}/cassini.c | 0
drivers/net/{ => ethernet/sun}/cassini.h | 0
drivers/net/{ => ethernet/sun}/niu.c | 0
drivers/net/{ => ethernet/sun}/niu.h | 0
drivers/net/{ => ethernet/sun}/sunbmac.c | 0
drivers/net/{ => ethernet/sun}/sunbmac.h | 0
drivers/net/{ => ethernet/sun}/sungem.c | 0
drivers/net/{ => ethernet/sun}/sungem.h | 0
drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
drivers/net/{ => ethernet/sun}/sunhme.c | 0
drivers/net/{ => ethernet/sun}/sunhme.h | 0
drivers/net/{ => ethernet/sun}/sunqe.c | 0
drivers/net/{ => ethernet/sun}/sunqe.h | 0
drivers/net/{ => ethernet/sun}/sunvnet.c | 0
drivers/net/{ => ethernet/sun}/sunvnet.h | 0
drivers/net/spider_net.h | 2 +-
24 files changed, 98 insertions(+), 76 deletions(-)
create mode 100644 drivers/net/ethernet/sun/Kconfig
create mode 100644 drivers/net/ethernet/sun/Makefile
rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
rename drivers/net/{ => ethernet/sun}/niu.c (100%)
rename drivers/net/{ => ethernet/sun}/niu.h (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e922c04..a0cc8ac8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6095,6 +6095,7 @@ S: Maintained
F: arch/m68k/kernel/*sun3*
F: arch/m68k/sun3*/
F: arch/m68k/include/asm/sun3*
+F: drivers/net/ethernet/i825xx/sun3*
SUPERH
M: Paul Mundt <lethal@linux-sh.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b76de82..7977002 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -363,64 +363,6 @@ config SH_ETH
This driver supporting CPUs are:
- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-config HAPPYMEAL
- tristate "Sun Happy Meal 10/100baseT support"
- depends on SBUS || PCI
- select CRC32
- help
- This driver supports the "hme" interface present on most Ultra
- systems and as an option on older Sbus systems. This driver supports
- both PCI and Sbus devices. This driver also supports the "qfe" quad
- 100baseT device available in both PCI and Sbus configurations.
-
- To compile this driver as a module, choose M here: the module
- will be called sunhme.
-
-config SUNBMAC
- tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
- depends on SBUS && EXPERIMENTAL
- select CRC32
- help
- This driver supports the "be" interface available as an Sbus option.
- This is Sun's older 100baseT Ethernet device.
-
- To compile this driver as a module, choose M here: the module
- will be called sunbmac.
-
-config SUNQE
- tristate "Sun QuadEthernet support"
- depends on SBUS
- select CRC32
- help
- This driver supports the "qe" 10baseT Ethernet device, available as
- an Sbus option. Note that this is not the same as Quad FastEthernet
- "qfe" which is supported by the Happy Meal driver instead.
-
- To compile this driver as a module, choose M here: the module
- will be called sunqe.
-
-config SUNGEM
- tristate "Sun GEM support"
- depends on PCI
- select CRC32
- help
- Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-
-config CASSINI
- tristate "Sun Cassini support"
- depends on PCI
- select CRC32
- help
- Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
-
-config SUNVNET
- tristate "Sun Virtual Network support"
- depends on SUN_LDOMS
- help
- Support for virtual network devices under Sun Logical Domains.
-
config BFIN_MAC
tristate "Blackfin on-chip MAC support"
depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -1603,14 +1545,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 NIU
- tristate "Sun Neptune 10Gbit Ethernet support"
- depends on PCI
- select CRC32
- help
- This enables support for cards based upon Sun's
- Neptune chipset.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e641f70..cfbb060 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -44,13 +44,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_HAPPYMEAL) += sunhme.o
-obj-$(CONFIG_SUNQE) += sunqe.o
-obj-$(CONFIG_SUNBMAC) += sunbmac.o
-obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
-obj-$(CONFIG_CASSINI) += cassini.o
-obj-$(CONFIG_SUNVNET) += sunvnet.o
-
obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
@@ -64,7 +57,7 @@ obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.o
obj-$(CONFIG_FEALNX) += fealnx.o
spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
@@ -207,7 +200,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
-obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7efbb7c..5edd237 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -21,5 +21,6 @@ source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
+source "drivers/net/ethernet/sun/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 86da8b8..18d8a89 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
+obj-$(CONFIG_NET_VENDOR_SUN) += sun/
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
new file mode 100644
index 0000000..84e06ec
--- /dev/null
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -0,0 +1,82 @@
+#
+# Sun network device configuration
+#
+
+config NET_VENDOR_SUN
+ bool "Sun devices"
+ depends on SUN3 || SBUS || PCI || SUN_LDOMS
+ ---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 Sun network interfaces. If you say Y, you will be
+ asked for your specific card in the following questions.
+
+config HAPPYMEAL
+ tristate "Sun Happy Meal 10/100baseT support"
+ depends on NET_VENDOR_SUN && (SBUS || PCI)
+ select CRC32
+ ---help---
+ This driver supports the "hme" interface present on most Ultra
+ systems and as an option on older Sbus systems. This driver supports
+ both PCI and Sbus devices. This driver also supports the "qfe" quad
+ 100baseT device available in both PCI and Sbus configurations.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunhme.
+
+config SUNBMAC
+ tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
+ depends on NET_VENDOR_SUN && SBUS && EXPERIMENTAL
+ select CRC32
+ ---help---
+ This driver supports the "be" interface available as an Sbus option.
+ This is Sun's older 100baseT Ethernet device.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunbmac.
+
+config SUNQE
+ tristate "Sun QuadEthernet support"
+ depends on NET_VENDOR_SUN && SBUS
+ select CRC32
+ ---help---
+ This driver supports the "qe" 10baseT Ethernet device, available as
+ an Sbus option. Note that this is not the same as Quad FastEthernet
+ "qfe" which is supported by the Happy Meal driver instead.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunqe.
+
+config SUNGEM
+ tristate "Sun GEM support"
+ depends on NET_VENDOR_SUN && PCI
+ select CRC32
+ ---help---
+ Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
+
+config CASSINI
+ tristate "Sun Cassini support"
+ depends on NET_VENDOR_SUN && PCI
+ select CRC32
+ ---help---
+ Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
+
+config SUNVNET
+ tristate "Sun Virtual Network support"
+ depends on NET_VENDOR_SUN && SUN_LDOMS
+ ---help---
+ Support for virtual network devices under Sun Logical Domains.
+
+config NIU
+ tristate "Sun Neptune 10Gbit Ethernet support"
+ depends on NET_VENDOR_SUN && PCI
+ select CRC32
+ ---help---
+ This enables support for cards based upon Sun's
+ Neptune chipset.
diff --git a/drivers/net/ethernet/sun/Makefile b/drivers/net/ethernet/sun/Makefile
new file mode 100644
index 0000000..4f25217
--- /dev/null
+++ b/drivers/net/ethernet/sun/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Sun network device drivers.
+#
+
+obj-$(CONFIG_HAPPYMEAL) += sunhme.o
+obj-$(CONFIG_SUNQE) += sunqe.o
+obj-$(CONFIG_SUNBMAC) += sunbmac.o
+obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
+obj-$(CONFIG_CASSINI) += cassini.o
+obj-$(CONFIG_SUNVNET) += sunvnet.o
+obj-$(CONFIG_NIU) += niu.o
diff --git a/drivers/net/cassini.c b/drivers/net/ethernet/sun/cassini.c
similarity index 100%
rename from drivers/net/cassini.c
rename to drivers/net/ethernet/sun/cassini.c
diff --git a/drivers/net/cassini.h b/drivers/net/ethernet/sun/cassini.h
similarity index 100%
rename from drivers/net/cassini.h
rename to drivers/net/ethernet/sun/cassini.h
diff --git a/drivers/net/niu.c b/drivers/net/ethernet/sun/niu.c
similarity index 100%
rename from drivers/net/niu.c
rename to drivers/net/ethernet/sun/niu.c
diff --git a/drivers/net/niu.h b/drivers/net/ethernet/sun/niu.h
similarity index 100%
rename from drivers/net/niu.h
rename to drivers/net/ethernet/sun/niu.h
diff --git a/drivers/net/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
similarity index 100%
rename from drivers/net/sunbmac.c
rename to drivers/net/ethernet/sun/sunbmac.c
diff --git a/drivers/net/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h
similarity index 100%
rename from drivers/net/sunbmac.h
rename to drivers/net/ethernet/sun/sunbmac.h
diff --git a/drivers/net/sungem.c b/drivers/net/ethernet/sun/sungem.c
similarity index 100%
rename from drivers/net/sungem.c
rename to drivers/net/ethernet/sun/sungem.c
diff --git a/drivers/net/sungem.h b/drivers/net/ethernet/sun/sungem.h
similarity index 100%
rename from drivers/net/sungem.h
rename to drivers/net/ethernet/sun/sungem.h
diff --git a/drivers/net/sungem_phy.c b/drivers/net/ethernet/sun/sungem_phy.c
similarity index 100%
rename from drivers/net/sungem_phy.c
rename to drivers/net/ethernet/sun/sungem_phy.c
diff --git a/drivers/net/sungem_phy.h b/drivers/net/ethernet/sun/sungem_phy.h
similarity index 100%
rename from drivers/net/sungem_phy.h
rename to drivers/net/ethernet/sun/sungem_phy.h
diff --git a/drivers/net/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
similarity index 100%
rename from drivers/net/sunhme.c
rename to drivers/net/ethernet/sun/sunhme.c
diff --git a/drivers/net/sunhme.h b/drivers/net/ethernet/sun/sunhme.h
similarity index 100%
rename from drivers/net/sunhme.h
rename to drivers/net/ethernet/sun/sunhme.h
diff --git a/drivers/net/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
similarity index 100%
rename from drivers/net/sunqe.c
rename to drivers/net/ethernet/sun/sunqe.c
diff --git a/drivers/net/sunqe.h b/drivers/net/ethernet/sun/sunqe.h
similarity index 100%
rename from drivers/net/sunqe.h
rename to drivers/net/ethernet/sun/sunqe.h
diff --git a/drivers/net/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
similarity index 100%
rename from drivers/net/sunvnet.c
rename to drivers/net/ethernet/sun/sunvnet.c
diff --git a/drivers/net/sunvnet.h b/drivers/net/ethernet/sun/sunvnet.h
similarity index 100%
rename from drivers/net/sunvnet.h
rename to drivers/net/ethernet/sun/sunvnet.h
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 020f64a..a891ad0 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -27,7 +27,7 @@
#define VERSION "2.0 B"
-#include "sungem_phy.h"
+#include "./ethernet/sun/sungem_phy.h"
extern int spider_net_stop(struct net_device *netdev);
extern int spider_net_open(struct net_device *netdev);
--
1.7.6
^ permalink raw reply related
* [net-next v2 13/71] sfc: Move the Solarflare drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Steve Hodgson,
Ben Hutchings
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
make the necessary Kconfig and Makefile changes.
CC: Steve Hodgson <shodgson@solarflare.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/sfc/Kconfig | 4 ++--
drivers/net/{ => ethernet}/sfc/Makefile | 0
drivers/net/{ => ethernet}/sfc/bitfield.h | 0
drivers/net/{ => ethernet}/sfc/efx.c | 0
drivers/net/{ => ethernet}/sfc/efx.h | 0
drivers/net/{ => ethernet}/sfc/enum.h | 0
drivers/net/{ => ethernet}/sfc/ethtool.c | 0
drivers/net/{ => ethernet}/sfc/falcon.c | 0
drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
drivers/net/{ => ethernet}/sfc/filter.c | 0
drivers/net/{ => ethernet}/sfc/filter.h | 0
drivers/net/{ => ethernet}/sfc/io.h | 0
drivers/net/{ => ethernet}/sfc/mac.h | 0
drivers/net/{ => ethernet}/sfc/mcdi.c | 0
drivers/net/{ => ethernet}/sfc/mcdi.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
drivers/net/{ => ethernet}/sfc/mtd.c | 0
drivers/net/{ => ethernet}/sfc/net_driver.h | 0
drivers/net/{ => ethernet}/sfc/nic.c | 0
drivers/net/{ => ethernet}/sfc/nic.h | 0
drivers/net/{ => ethernet}/sfc/phy.h | 0
drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
drivers/net/{ => ethernet}/sfc/regs.h | 0
drivers/net/{ => ethernet}/sfc/rx.c | 0
drivers/net/{ => ethernet}/sfc/selftest.c | 0
drivers/net/{ => ethernet}/sfc/selftest.h | 0
drivers/net/{ => ethernet}/sfc/siena.c | 0
drivers/net/{ => ethernet}/sfc/spi.h | 0
drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
drivers/net/{ => ethernet}/sfc/tx.c | 0
drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
drivers/net/{ => ethernet}/sfc/workarounds.h | 0
42 files changed, 5 insertions(+), 6 deletions(-)
rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
rename drivers/net/{ => ethernet}/sfc/io.h (100%)
rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index a0cc8ac8..28ee38d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5716,7 +5716,7 @@ M: Steve Hodgson <shodgson@solarflare.com>
M: Ben Hutchings <bhutchings@solarflare.com>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/sfc/
+F: drivers/net/ethernet/sfc/
SGI GRU DRIVER
M: Jack Steiner <steiner@sgi.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7977002..fe22712 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1598,8 +1598,6 @@ config BNA
<http://support.brocade.com>
-source "drivers/net/sfc/Kconfig"
-
source "drivers/net/benet/Kconfig"
endif # NETDEV_10000
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index cfbb060..faf3068 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -201,7 +201,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
-obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_CAIF) += caif/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 5edd237..0bc6635 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 18d8a89..50faab5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,5 +11,6 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
diff --git a/drivers/net/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
similarity index 96%
rename from drivers/net/sfc/Kconfig
rename to drivers/net/ethernet/sfc/Kconfig
index a3d5bb9..5d18841 100644
--- a/drivers/net/sfc/Kconfig
+++ b/drivers/net/ethernet/sfc/Kconfig
@@ -5,7 +5,7 @@ config SFC
select CRC32
select I2C
select I2C_ALGOBIT
- help
+ ---help---
This driver supports 10-gigabit Ethernet cards based on
the Solarflare SFC4000 and SFC9000-family controllers.
@@ -15,7 +15,7 @@ config SFC_MTD
bool "Solarflare SFC4000/SFC9000-family MTD support"
depends on SFC && MTD && !(SFC=y && MTD=m)
default y
- help
+ ---help---
This exposes the on-board flash memory as MTD devices (e.g.
/dev/mtd1). This makes it possible to upload new firmware
to the NIC.
diff --git a/drivers/net/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile
similarity index 100%
rename from drivers/net/sfc/Makefile
rename to drivers/net/ethernet/sfc/Makefile
diff --git a/drivers/net/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h
similarity index 100%
rename from drivers/net/sfc/bitfield.h
rename to drivers/net/ethernet/sfc/bitfield.h
diff --git a/drivers/net/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
similarity index 100%
rename from drivers/net/sfc/efx.c
rename to drivers/net/ethernet/sfc/efx.c
diff --git a/drivers/net/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
similarity index 100%
rename from drivers/net/sfc/efx.h
rename to drivers/net/ethernet/sfc/efx.h
diff --git a/drivers/net/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h
similarity index 100%
rename from drivers/net/sfc/enum.h
rename to drivers/net/ethernet/sfc/enum.h
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
similarity index 100%
rename from drivers/net/sfc/ethtool.c
rename to drivers/net/ethernet/sfc/ethtool.c
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
similarity index 100%
rename from drivers/net/sfc/falcon.c
rename to drivers/net/ethernet/sfc/falcon.c
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c
similarity index 100%
rename from drivers/net/sfc/falcon_boards.c
rename to drivers/net/ethernet/sfc/falcon_boards.c
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/ethernet/sfc/falcon_xmac.c
similarity index 100%
rename from drivers/net/sfc/falcon_xmac.c
rename to drivers/net/ethernet/sfc/falcon_xmac.c
diff --git a/drivers/net/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c
similarity index 100%
rename from drivers/net/sfc/filter.c
rename to drivers/net/ethernet/sfc/filter.c
diff --git a/drivers/net/sfc/filter.h b/drivers/net/ethernet/sfc/filter.h
similarity index 100%
rename from drivers/net/sfc/filter.h
rename to drivers/net/ethernet/sfc/filter.h
diff --git a/drivers/net/sfc/io.h b/drivers/net/ethernet/sfc/io.h
similarity index 100%
rename from drivers/net/sfc/io.h
rename to drivers/net/ethernet/sfc/io.h
diff --git a/drivers/net/sfc/mac.h b/drivers/net/ethernet/sfc/mac.h
similarity index 100%
rename from drivers/net/sfc/mac.h
rename to drivers/net/ethernet/sfc/mac.h
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
similarity index 100%
rename from drivers/net/sfc/mcdi.c
rename to drivers/net/ethernet/sfc/mcdi.c
diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/ethernet/sfc/mcdi.h
similarity index 100%
rename from drivers/net/sfc/mcdi.h
rename to drivers/net/ethernet/sfc/mcdi.h
diff --git a/drivers/net/sfc/mcdi_mac.c b/drivers/net/ethernet/sfc/mcdi_mac.c
similarity index 100%
rename from drivers/net/sfc/mcdi_mac.c
rename to drivers/net/ethernet/sfc/mcdi_mac.c
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
similarity index 100%
rename from drivers/net/sfc/mcdi_pcol.h
rename to drivers/net/ethernet/sfc/mcdi_pcol.h
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/ethernet/sfc/mcdi_phy.c
similarity index 100%
rename from drivers/net/sfc/mcdi_phy.c
rename to drivers/net/ethernet/sfc/mcdi_phy.c
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/ethernet/sfc/mdio_10g.c
similarity index 100%
rename from drivers/net/sfc/mdio_10g.c
rename to drivers/net/ethernet/sfc/mdio_10g.c
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/ethernet/sfc/mdio_10g.h
similarity index 100%
rename from drivers/net/sfc/mdio_10g.h
rename to drivers/net/ethernet/sfc/mdio_10g.h
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
similarity index 100%
rename from drivers/net/sfc/mtd.c
rename to drivers/net/ethernet/sfc/mtd.c
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
similarity index 100%
rename from drivers/net/sfc/net_driver.h
rename to drivers/net/ethernet/sfc/net_driver.h
diff --git a/drivers/net/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
similarity index 100%
rename from drivers/net/sfc/nic.c
rename to drivers/net/ethernet/sfc/nic.c
diff --git a/drivers/net/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
similarity index 100%
rename from drivers/net/sfc/nic.h
rename to drivers/net/ethernet/sfc/nic.h
diff --git a/drivers/net/sfc/phy.h b/drivers/net/ethernet/sfc/phy.h
similarity index 100%
rename from drivers/net/sfc/phy.h
rename to drivers/net/ethernet/sfc/phy.h
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/ethernet/sfc/qt202x_phy.c
similarity index 100%
rename from drivers/net/sfc/qt202x_phy.c
rename to drivers/net/ethernet/sfc/qt202x_phy.c
diff --git a/drivers/net/sfc/regs.h b/drivers/net/ethernet/sfc/regs.h
similarity index 100%
rename from drivers/net/sfc/regs.h
rename to drivers/net/ethernet/sfc/regs.h
diff --git a/drivers/net/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
similarity index 100%
rename from drivers/net/sfc/rx.c
rename to drivers/net/ethernet/sfc/rx.c
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
similarity index 100%
rename from drivers/net/sfc/selftest.c
rename to drivers/net/ethernet/sfc/selftest.c
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/ethernet/sfc/selftest.h
similarity index 100%
rename from drivers/net/sfc/selftest.h
rename to drivers/net/ethernet/sfc/selftest.h
diff --git a/drivers/net/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
similarity index 100%
rename from drivers/net/sfc/siena.c
rename to drivers/net/ethernet/sfc/siena.c
diff --git a/drivers/net/sfc/spi.h b/drivers/net/ethernet/sfc/spi.h
similarity index 100%
rename from drivers/net/sfc/spi.h
rename to drivers/net/ethernet/sfc/spi.h
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/ethernet/sfc/tenxpress.c
similarity index 100%
rename from drivers/net/sfc/tenxpress.c
rename to drivers/net/ethernet/sfc/tenxpress.c
diff --git a/drivers/net/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
similarity index 100%
rename from drivers/net/sfc/tx.c
rename to drivers/net/ethernet/sfc/tx.c
diff --git a/drivers/net/sfc/txc43128_phy.c b/drivers/net/ethernet/sfc/txc43128_phy.c
similarity index 100%
rename from drivers/net/sfc/txc43128_phy.c
rename to drivers/net/ethernet/sfc/txc43128_phy.c
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/ethernet/sfc/workarounds.h
similarity index 100%
rename from drivers/net/sfc/workarounds.h
rename to drivers/net/ethernet/sfc/workarounds.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 14/71] be2net: Move the Emulex driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Sathya Perla,
Subbu Seetharaman, Ajit Khaparde
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Emulex driver into drivers/net/ethernet/emulex/ and
make the necessary Kconfig and Makefile changes.
CC: Sathya Perla <sathya.perla@emulex.com>
CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
CC: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/benet/Kconfig | 6 ------
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/emulex/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/emulex/Makefile | 5 +++++
drivers/net/ethernet/emulex/benet/Kconfig | 6 ++++++
drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
drivers/net/{ => ethernet/emulex}/benet/be.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 0
.../net/{ => ethernet/emulex}/benet/be_ethtool.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_main.c | 0
16 files changed, 32 insertions(+), 10 deletions(-)
delete mode 100644 drivers/net/benet/Kconfig
create mode 100644 drivers/net/ethernet/emulex/Kconfig
create mode 100644 drivers/net/ethernet/emulex/Makefile
create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 28ee38d..0c0fda5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5708,7 +5708,7 @@ M: Ajit Khaparde <ajit.khaparde@emulex.com>
L: netdev@vger.kernel.org
W: http://www.emulex.com
S: Supported
-F: drivers/net/benet/
+F: drivers/net/ethernet/emulex/benet/
SFC NETWORK DRIVER
M: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fe22712..db03c21 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1598,8 +1598,6 @@ config BNA
<http://support.brocade.com>
-source "drivers/net/benet/Kconfig"
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index faf3068..39b04e0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_ENIC) += enic/
obj-$(CONFIG_JME) += jme.o
-obj-$(CONFIG_BE2NET) += benet/
obj-$(CONFIG_VMXNET3) += vmxnet3/
obj-$(CONFIG_BNA) += bna/
diff --git a/drivers/net/benet/Kconfig b/drivers/net/benet/Kconfig
deleted file mode 100644
index 1a41a49..0000000
--- a/drivers/net/benet/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config BE2NET
- tristate "ServerEngines' 10Gbps NIC - BladeEngine"
- depends on PCI && INET
- help
- This driver implements the NIC functionality for ServerEngines'
- 10Gbps network adapter - BladeEngine.
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0bc6635..9c003f3 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -16,6 +16,7 @@ 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/emulex/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 50faab5..2ac05ba 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ 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_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig
new file mode 100644
index 0000000..f8a68ce
--- /dev/null
+++ b/drivers/net/ethernet/emulex/Kconfig
@@ -0,0 +1,18 @@
+#
+# Emulex driver configuration
+#
+
+config NET_VENDOR_EMULEX
+ bool "Emulex 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 Emulex cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/emulex/benet/Kconfig"
diff --git a/drivers/net/ethernet/emulex/Makefile b/drivers/net/ethernet/emulex/Makefile
new file mode 100644
index 0000000..ea8ec57
--- /dev/null
+++ b/drivers/net/ethernet/emulex/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Emulex device drivers.
+#
+
+obj-$(CONFIG_BE2NET) += benet/
diff --git a/drivers/net/ethernet/emulex/benet/Kconfig b/drivers/net/ethernet/emulex/benet/Kconfig
new file mode 100644
index 0000000..ca2c28e
--- /dev/null
+++ b/drivers/net/ethernet/emulex/benet/Kconfig
@@ -0,0 +1,6 @@
+config BE2NET
+ tristate "ServerEngines' 10Gbps NIC - BladeEngine"
+ depends on NET_VENDOR_EMULEX && PCI && INET
+ ---help---
+ This driver implements the NIC functionality for ServerEngines'
+ 10Gbps network adapter - BladeEngine.
diff --git a/drivers/net/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile
similarity index 100%
rename from drivers/net/benet/Makefile
rename to drivers/net/ethernet/emulex/benet/Makefile
diff --git a/drivers/net/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
similarity index 100%
rename from drivers/net/benet/be.h
rename to drivers/net/ethernet/emulex/benet/be.h
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
similarity index 100%
rename from drivers/net/benet/be_cmds.c
rename to drivers/net/ethernet/emulex/benet/be_cmds.c
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
similarity index 100%
rename from drivers/net/benet/be_cmds.h
rename to drivers/net/ethernet/emulex/benet/be_cmds.h
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
similarity index 100%
rename from drivers/net/benet/be_ethtool.c
rename to drivers/net/ethernet/emulex/benet/be_ethtool.c
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
similarity index 100%
rename from drivers/net/benet/be_hw.h
rename to drivers/net/ethernet/emulex/benet/be_hw.h
diff --git a/drivers/net/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
similarity index 100%
rename from drivers/net/benet/be_main.c
rename to drivers/net/ethernet/emulex/benet/be_main.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 16/71] mlx4: Move the Mellanox driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Roland Dreier
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and
make the necessary Kconfig and Makefile changes.
CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 24 -----------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/mellanox/Kconfig | 18 +++++++++++++
drivers/net/ethernet/mellanox/Makefile | 5 +++
drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 ++++++++++++++++++++
drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
.../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
40 files changed, 52 insertions(+), 25 deletions(-)
create mode 100644 drivers/net/ethernet/mellanox/Kconfig
create mode 100644 drivers/net/ethernet/mellanox/Makefile
create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2701ee9..56c033a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1554,30 +1554,6 @@ config PASEMI_MAC
This driver supports the on-chip 1/10Gbit Ethernet controller on
PA Semi's PWRficient line of chips.
-config MLX4_EN
- tristate "Mellanox Technologies 10Gbit Ethernet support"
- depends on PCI && INET
- select MLX4_CORE
- select INET_LRO
- help
- This driver supports Mellanox Technologies ConnectX Ethernet
- devices.
-
-config MLX4_CORE
- tristate
- depends on PCI
- default n
-
-config MLX4_DEBUG
- bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
- depends on MLX4_CORE
- default y
- ---help---
- This option causes debugging code to be compiled into the
- mlx4_core driver. The output can be turned on via the
- debug_level module parameter (which can also be set after
- the driver is loaded through sysfs).
-
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c8a176f..73e357e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -157,7 +157,6 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
-obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 225918d..8bbddc9 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
+source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 734f7c9..e5f2954 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
+obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
new file mode 100644
index 0000000..ba0524a
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -0,0 +1,18 @@
+#
+# Mellanox driver configuration
+#
+
+config NET_VENDOR_MELLANOX
+ bool "Mellanox 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 Mellanox cards. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+source "drivers/net/ethernet/mellanox/mlx4/Kconfig"
diff --git a/drivers/net/ethernet/mellanox/Makefile b/drivers/net/ethernet/mellanox/Makefile
new file mode 100644
index 0000000..37afb96
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Mellanox device drivers.
+#
+
+obj-$(CONFIG_MLX4_CORE) += mlx4/
diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig
new file mode 100644
index 0000000..67df67a
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig
@@ -0,0 +1,27 @@
+#
+# Mellanox driver configuration
+#
+
+config MLX4_EN
+ tristate "Mellanox Technologies 10Gbit Ethernet support"
+ depends on NET_VENDOR_MELLANOX && PCI && INET
+ select MLX4_CORE
+ select INET_LRO
+ ---help---
+ This driver supports Mellanox Technologies ConnectX Ethernet
+ devices.
+
+config MLX4_CORE
+ tristate
+ depends on PCI
+ default n
+
+config MLX4_DEBUG
+ bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
+ depends on MLX4_CORE
+ default y
+ ---help---
+ This option causes debugging code to be compiled into the
+ mlx4_core driver. The output can be turned on via the
+ debug_level module parameter (which can also be set after
+ the driver is loaded through sysfs).
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile
similarity index 100%
rename from drivers/net/mlx4/Makefile
rename to drivers/net/ethernet/mellanox/mlx4/Makefile
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
similarity index 100%
rename from drivers/net/mlx4/alloc.c
rename to drivers/net/ethernet/mellanox/mlx4/alloc.c
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c
similarity index 100%
rename from drivers/net/mlx4/catas.c
rename to drivers/net/ethernet/mellanox/mlx4/catas.c
diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
similarity index 100%
rename from drivers/net/mlx4/cmd.c
rename to drivers/net/ethernet/mellanox/mlx4/cmd.c
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
similarity index 100%
rename from drivers/net/mlx4/cq.c
rename to drivers/net/ethernet/mellanox/mlx4/cq.c
diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
similarity index 100%
rename from drivers/net/mlx4/en_cq.c
rename to drivers/net/ethernet/mellanox/mlx4/en_cq.c
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
similarity index 100%
rename from drivers/net/mlx4/en_ethtool.c
rename to drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
similarity index 100%
rename from drivers/net/mlx4/en_main.c
rename to drivers/net/ethernet/mellanox/mlx4/en_main.c
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
similarity index 100%
rename from drivers/net/mlx4/en_netdev.c
rename to drivers/net/ethernet/mellanox/mlx4/en_netdev.c
diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c
similarity index 100%
rename from drivers/net/mlx4/en_port.c
rename to drivers/net/ethernet/mellanox/mlx4/en_port.c
diff --git a/drivers/net/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h
similarity index 100%
rename from drivers/net/mlx4/en_port.h
rename to drivers/net/ethernet/mellanox/mlx4/en_port.h
diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
similarity index 100%
rename from drivers/net/mlx4/en_resources.c
rename to drivers/net/ethernet/mellanox/mlx4/en_resources.c
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
similarity index 100%
rename from drivers/net/mlx4/en_rx.c
rename to drivers/net/ethernet/mellanox/mlx4/en_rx.c
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c
similarity index 100%
rename from drivers/net/mlx4/en_selftest.c
rename to drivers/net/ethernet/mellanox/mlx4/en_selftest.c
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
similarity index 100%
rename from drivers/net/mlx4/en_tx.c
rename to drivers/net/ethernet/mellanox/mlx4/en_tx.c
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
similarity index 100%
rename from drivers/net/mlx4/eq.c
rename to drivers/net/ethernet/mellanox/mlx4/eq.c
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
similarity index 100%
rename from drivers/net/mlx4/fw.c
rename to drivers/net/ethernet/mellanox/mlx4/fw.c
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
similarity index 100%
rename from drivers/net/mlx4/fw.h
rename to drivers/net/ethernet/mellanox/mlx4/fw.h
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
similarity index 100%
rename from drivers/net/mlx4/icm.c
rename to drivers/net/ethernet/mellanox/mlx4/icm.c
diff --git a/drivers/net/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h
similarity index 100%
rename from drivers/net/mlx4/icm.h
rename to drivers/net/ethernet/mellanox/mlx4/icm.h
diff --git a/drivers/net/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
similarity index 100%
rename from drivers/net/mlx4/intf.c
rename to drivers/net/ethernet/mellanox/mlx4/intf.c
diff --git a/drivers/net/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
similarity index 100%
rename from drivers/net/mlx4/main.c
rename to drivers/net/ethernet/mellanox/mlx4/main.c
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
similarity index 100%
rename from drivers/net/mlx4/mcg.c
rename to drivers/net/ethernet/mellanox/mlx4/mcg.c
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
similarity index 100%
rename from drivers/net/mlx4/mlx4.h
rename to drivers/net/ethernet/mellanox/mlx4/mlx4.h
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
similarity index 100%
rename from drivers/net/mlx4/mlx4_en.h
rename to drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
similarity index 100%
rename from drivers/net/mlx4/mr.c
rename to drivers/net/ethernet/mellanox/mlx4/mr.c
diff --git a/drivers/net/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
similarity index 100%
rename from drivers/net/mlx4/pd.c
rename to drivers/net/ethernet/mellanox/mlx4/pd.c
diff --git a/drivers/net/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
similarity index 100%
rename from drivers/net/mlx4/port.c
rename to drivers/net/ethernet/mellanox/mlx4/port.c
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
similarity index 100%
rename from drivers/net/mlx4/profile.c
rename to drivers/net/ethernet/mellanox/mlx4/profile.c
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
similarity index 100%
rename from drivers/net/mlx4/qp.c
rename to drivers/net/ethernet/mellanox/mlx4/qp.c
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/ethernet/mellanox/mlx4/reset.c
similarity index 100%
rename from drivers/net/mlx4/reset.c
rename to drivers/net/ethernet/mellanox/mlx4/reset.c
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/ethernet/mellanox/mlx4/sense.c
similarity index 100%
rename from drivers/net/mlx4/sense.c
rename to drivers/net/ethernet/mellanox/mlx4/sense.c
diff --git a/drivers/net/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
similarity index 100%
rename from drivers/net/mlx4/srq.c
rename to drivers/net/ethernet/mellanox/mlx4/srq.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 15/71] bna: Move the Brocade driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Rasesh Mody, Debashis Dutt
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Brocade driver into drivers/net/ethernet/brocade/ and make
the necessary Kconfig and Makefile changes.
CC: Rasesh Mody <rmody@brocade.com>
CC: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 14 --------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/brocade/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/brocade/Makefile | 5 +++++
drivers/net/ethernet/brocade/bna/Kconfig | 17 +++++++++++++++++
drivers/net/{ => ethernet/brocade}/bna/Makefile | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfi.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_hw.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.c | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.h | 0
.../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 0
drivers/net/{ => ethernet/brocade}/bna/cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0
33 files changed, 43 insertions(+), 16 deletions(-)
create mode 100644 drivers/net/ethernet/brocade/Kconfig
create mode 100644 drivers/net/ethernet/brocade/Makefile
create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0c0fda5..ddec2eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1569,7 +1569,7 @@ M: Rasesh Mody <rmody@brocade.com>
M: Debashis Dutt <ddutt@brocade.com>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/bna/
+F: drivers/net/ethernet/brocade/bna/
BSG (block layer generic sg v4 driver)
M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index db03c21..2701ee9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1584,20 +1584,6 @@ config TEHUTI
help
Tehuti Networks 10G Ethernet NIC
-config BNA
- tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
- depends on PCI
- ---help---
- This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet
- cards.
- To compile this driver as a module, choose M here: the module
- will be called bna.
-
- For general information and support, go to the Brocade support
- website at:
-
- <http://support.brocade.com>
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 39b04e0..c8a176f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_ENIC) += enic/
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
-obj-$(CONFIG_BNA) += bna/
gianfar_driver-objs := gianfar.o \
gianfar_ethtool.o \
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9c003f3..225918d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,6 +15,7 @@ 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/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 2ac05ba..734f7c9 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ 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_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig
new file mode 100644
index 0000000..8d8bff7
--- /dev/null
+++ b/drivers/net/ethernet/brocade/Kconfig
@@ -0,0 +1,18 @@
+#
+# Brocade device configuration
+#
+
+config NET_VENDOR_BROCADE
+ bool "Brocade 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 Brocade cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/brocade/bna/Kconfig"
diff --git a/drivers/net/ethernet/brocade/Makefile b/drivers/net/ethernet/brocade/Makefile
new file mode 100644
index 0000000..b58238d
--- /dev/null
+++ b/drivers/net/ethernet/brocade/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Brocade device drivers.
+#
+
+obj-$(CONFIG_BNA) += bna/
diff --git a/drivers/net/ethernet/brocade/bna/Kconfig b/drivers/net/ethernet/brocade/bna/Kconfig
new file mode 100644
index 0000000..ba37af2
--- /dev/null
+++ b/drivers/net/ethernet/brocade/bna/Kconfig
@@ -0,0 +1,17 @@
+#
+# Brocade network device configuration
+#
+
+config BNA
+ tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
+ depends on NET_VENDOR_BROCADE && PCI
+ ---help---
+ This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet
+ cards.
+ To compile this driver as a module, choose M here: the module
+ will be called bna.
+
+ For general information and support, go to the Brocade support
+ website at:
+
+ <http://support.brocade.com>
diff --git a/drivers/net/bna/Makefile b/drivers/net/ethernet/brocade/bna/Makefile
similarity index 100%
rename from drivers/net/bna/Makefile
rename to drivers/net/ethernet/brocade/bna/Makefile
diff --git a/drivers/net/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c
similarity index 100%
rename from drivers/net/bna/bfa_cee.c
rename to drivers/net/ethernet/brocade/bna/bfa_cee.c
diff --git a/drivers/net/bna/bfa_cee.h b/drivers/net/ethernet/brocade/bna/bfa_cee.h
similarity index 100%
rename from drivers/net/bna/bfa_cee.h
rename to drivers/net/ethernet/brocade/bna/bfa_cee.h
diff --git a/drivers/net/bna/bfa_cs.h b/drivers/net/ethernet/brocade/bna/bfa_cs.h
similarity index 100%
rename from drivers/net/bna/bfa_cs.h
rename to drivers/net/ethernet/brocade/bna/bfa_cs.h
diff --git a/drivers/net/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h
similarity index 100%
rename from drivers/net/bna/bfa_defs.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs.h
diff --git a/drivers/net/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_cna.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
diff --git a/drivers/net/bna/bfa_defs_mfg_comm.h b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_mfg_comm.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
diff --git a/drivers/net/bna/bfa_defs_status.h b/drivers/net/ethernet/brocade/bna/bfa_defs_status.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_status.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_status.h
diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
similarity index 100%
rename from drivers/net/bna/bfa_ioc.c
rename to drivers/net/ethernet/brocade/bna/bfa_ioc.c
diff --git a/drivers/net/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h
similarity index 100%
rename from drivers/net/bna/bfa_ioc.h
rename to drivers/net/ethernet/brocade/bna/bfa_ioc.h
diff --git a/drivers/net/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
similarity index 100%
rename from drivers/net/bna/bfa_ioc_ct.c
rename to drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
diff --git a/drivers/net/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h
similarity index 100%
rename from drivers/net/bna/bfi.h
rename to drivers/net/ethernet/brocade/bna/bfi.h
diff --git a/drivers/net/bna/bfi_cna.h b/drivers/net/ethernet/brocade/bna/bfi_cna.h
similarity index 100%
rename from drivers/net/bna/bfi_cna.h
rename to drivers/net/ethernet/brocade/bna/bfi_cna.h
diff --git a/drivers/net/bna/bfi_ctreg.h b/drivers/net/ethernet/brocade/bna/bfi_ctreg.h
similarity index 100%
rename from drivers/net/bna/bfi_ctreg.h
rename to drivers/net/ethernet/brocade/bna/bfi_ctreg.h
diff --git a/drivers/net/bna/bfi_ll.h b/drivers/net/ethernet/brocade/bna/bfi_ll.h
similarity index 100%
rename from drivers/net/bna/bfi_ll.h
rename to drivers/net/ethernet/brocade/bna/bfi_ll.h
diff --git a/drivers/net/bna/bna.h b/drivers/net/ethernet/brocade/bna/bna.h
similarity index 100%
rename from drivers/net/bna/bna.h
rename to drivers/net/ethernet/brocade/bna/bna.h
diff --git a/drivers/net/bna/bna_ctrl.c b/drivers/net/ethernet/brocade/bna/bna_ctrl.c
similarity index 100%
rename from drivers/net/bna/bna_ctrl.c
rename to drivers/net/ethernet/brocade/bna/bna_ctrl.c
diff --git a/drivers/net/bna/bna_hw.h b/drivers/net/ethernet/brocade/bna/bna_hw.h
similarity index 100%
rename from drivers/net/bna/bna_hw.h
rename to drivers/net/ethernet/brocade/bna/bna_hw.h
diff --git a/drivers/net/bna/bna_txrx.c b/drivers/net/ethernet/brocade/bna/bna_txrx.c
similarity index 100%
rename from drivers/net/bna/bna_txrx.c
rename to drivers/net/ethernet/brocade/bna/bna_txrx.c
diff --git a/drivers/net/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h
similarity index 100%
rename from drivers/net/bna/bna_types.h
rename to drivers/net/ethernet/brocade/bna/bna_types.h
diff --git a/drivers/net/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
similarity index 100%
rename from drivers/net/bna/bnad.c
rename to drivers/net/ethernet/brocade/bna/bnad.c
diff --git a/drivers/net/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h
similarity index 100%
rename from drivers/net/bna/bnad.h
rename to drivers/net/ethernet/brocade/bna/bnad.h
diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
similarity index 100%
rename from drivers/net/bna/bnad_ethtool.c
rename to drivers/net/ethernet/brocade/bna/bnad_ethtool.c
diff --git a/drivers/net/bna/cna.h b/drivers/net/ethernet/brocade/bna/cna.h
similarity index 100%
rename from drivers/net/bna/cna.h
rename to drivers/net/ethernet/brocade/bna/cna.h
diff --git a/drivers/net/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
similarity index 100%
rename from drivers/net/bna/cna_fwimg.c
rename to drivers/net/ethernet/brocade/bna/cna_fwimg.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 17/71] myri*: Move the Myricom drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Andrew Gallatin,
Brice Goglin
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
the necessary Kconfig and Makefile changes.
CC: Andrew Gallatin <gallatin@myri.com>
CC: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 26 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/myricom/Kconfig | 42 ++++++++++++++++++++
drivers/net/ethernet/myricom/Makefile | 5 ++
.../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
.../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
.../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
| 0
11 files changed, 50 insertions(+), 28 deletions(-)
create mode 100644 drivers/net/ethernet/myricom/Kconfig
create mode 100644 drivers/net/ethernet/myricom/Makefile
rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ddec2eb..3423692 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4308,7 +4308,7 @@ M: Andrew Gallatin <gallatin@myri.com>
L: netdev@vger.kernel.org
W: http://www.myri.com/scs/download-Myri10GE.html
S: Supported
-F: drivers/net/myri10ge/
+F: drivers/net/ethernet/myricom/myri10ge/
NATSEMI ETHERNET DRIVER (DP8381x)
M: Tim Hockin <thockin@hockin.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 56c033a..38fcaea 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1519,32 +1519,6 @@ config VXGE_DEBUG_TRACE_ALL
the vxge driver. By default only few debug trace statements are
enabled.
-config MYRI10GE
- tristate "Myricom Myri-10G Ethernet support"
- depends on PCI && INET
- select FW_LOADER
- select CRC32
- select INET_LRO
- ---help---
- This driver supports Myricom Myri-10G Dual Protocol interface in
- Ethernet mode. If the eeprom on your board is not recent enough,
- you will need a newer firmware image.
- You may get this image or more information, at:
-
- <http://www.myri.com/scs/download-Myri10GE.html>
-
- To compile this driver as a module, choose M here. The module
- will be called myri10ge.
-
-config MYRI10GE_DCA
- bool "Direct Cache Access (DCA) Support"
- default y
- depends on MYRI10GE && DCA && !(MYRI10GE=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 PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 73e357e..b9e1f5a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -151,7 +151,6 @@ obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_S2IO) += s2io.o
obj-$(CONFIG_VXGE) += vxge/
-obj-$(CONFIG_MYRI10GE) += myri10ge/
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8bbddc9..ce3040d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -21,6 +21,7 @@ source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e5f2954..b4dcb93 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
new file mode 100644
index 0000000..8dc4241
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -0,0 +1,42 @@
+#
+# Myricom device configuration
+#
+
+config NET_VENDOR_MYRI
+ bool "Myricom 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 Myricom cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config MYRI10GE
+ tristate "Myricom Myri-10G Ethernet support"
+ depends on NET_VENDOR_MYRI && PCI && INET
+ select FW_LOADER
+ select CRC32
+ select INET_LRO
+ ---help---
+ This driver supports Myricom Myri-10G Dual Protocol interface in
+ Ethernet mode. If the eeprom on your board is not recent enough,
+ you will need a newer firmware image.
+ You may get this image or more information, at:
+
+ <http://www.myri.com/scs/download-Myri10GE.html>
+
+ To compile this driver as a module, choose M here. The module
+ will be called myri10ge.
+
+config MYRI10GE_DCA
+ bool "Direct Cache Access (DCA) Support"
+ default y
+ depends on MYRI10GE && DCA && !(MYRI10GE=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.
diff --git a/drivers/net/ethernet/myricom/Makefile b/drivers/net/ethernet/myricom/Makefile
new file mode 100644
index 0000000..296c0a1
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Myricom network device drivers.
+#
+
+obj-$(CONFIG_MYRI10GE) += myri10ge/
diff --git a/drivers/net/myri10ge/Makefile b/drivers/net/ethernet/myricom/myri10ge/Makefile
similarity index 100%
rename from drivers/net/myri10ge/Makefile
rename to drivers/net/ethernet/myricom/myri10ge/Makefile
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
similarity index 100%
rename from drivers/net/myri10ge/myri10ge.c
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge.c
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp_gen_header.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 18/71] s2io/vxge: Move the Exar drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Jon Mason
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
necessary Kconfig and Makefile changes.
CC: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 3 +-
drivers/net/Kconfig | 34 -------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/neterion/Kconfig | 50 ++++++++++++++++++++
drivers/net/ethernet/neterion/Makefile | 6 ++
drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
drivers/net/{ => ethernet/neterion}/s2io.c | 0
drivers/net/{ => ethernet/neterion}/s2io.h | 0
drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
.../{ => ethernet/neterion}/vxge/vxge-version.h | 0
21 files changed, 59 insertions(+), 38 deletions(-)
create mode 100644 drivers/net/ethernet/neterion/Kconfig
create mode 100644 drivers/net/ethernet/neterion/Makefile
rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3423692..dc83dd9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4353,9 +4353,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
S: Supported
F: Documentation/networking/s2io.txt
-F: drivers/net/s2io*
F: Documentation/networking/vxge.txt
-F: drivers/net/vxge/
+F: drivers/net/ethernet/neterion/
NETFILTER/IPTABLES/IPCHAINS
P: Rusty Russell
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38fcaea..3e216b3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1485,40 +1485,6 @@ config ENIC
help
This enables the support for the Cisco VIC Ethernet card.
-config S2IO
- tristate "Exar Xframe 10Gb Ethernet Adapter"
- depends on PCI
- ---help---
- This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/s2io.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called s2io.
-
-config VXGE
- tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
- depends on PCI && INET
- ---help---
- This driver supports Exar Corp's X3100 Series 10 GbE PCIe
- I/O Virtualized Server Adapter.
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/vxge.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called vxge.
-
-config VXGE_DEBUG_TRACE_ALL
- bool "Enabling All Debug trace statments in driver"
- default n
- depends on VXGE
- ---help---
- Say Y here if you want to enabling all the debug trace statements in
- the vxge driver. By default only few debug trace statements are
- enabled.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b9e1f5a..d28c153e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -149,8 +149,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_S2IO) += s2io.o
-obj-$(CONFIG_VXGE) += vxge/
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ce3040d..1a39ec0 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
+source "drivers/net/ethernet/neterion/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b4dcb93..4c21e8f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
+obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
new file mode 100644
index 0000000..90874de
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -0,0 +1,50 @@
+#
+# Exar device configuration
+#
+
+config NET_VENDOR_EXAR
+ bool "Exar 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 Exar cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config S2IO
+ tristate "Exar Xframe 10Gb Ethernet Adapter"
+ depends on NET_VENDOR_EXAR && PCI
+ ---help---
+ This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/s2io.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called s2io.
+
+config VXGE
+ tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
+ depends on NET_VENDOR_EXAR && PCI && INET
+ ---help---
+ This driver supports Exar Corp's X3100 Series 10 GbE PCIe
+ I/O Virtualized Server Adapter.
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/vxge.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called vxge.
+
+config VXGE_DEBUG_TRACE_ALL
+ bool "Enabling All Debug trace statments in driver"
+ default n
+ depends on VXGE
+ ---help---
+ Say Y here if you want to enabling all the debug trace statements in
+ the vxge driver. By default only few debug trace statements are
+ enabled.
diff --git a/drivers/net/ethernet/neterion/Makefile b/drivers/net/ethernet/neterion/Makefile
new file mode 100644
index 0000000..70c8058
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Exar network device drivers.
+#
+
+obj-$(CONFIG_S2IO) += s2io.o
+obj-$(CONFIG_VXGE) += vxge/
diff --git a/drivers/net/s2io-regs.h b/drivers/net/ethernet/neterion/s2io-regs.h
similarity index 100%
rename from drivers/net/s2io-regs.h
rename to drivers/net/ethernet/neterion/s2io-regs.h
diff --git a/drivers/net/s2io.c b/drivers/net/ethernet/neterion/s2io.c
similarity index 100%
rename from drivers/net/s2io.c
rename to drivers/net/ethernet/neterion/s2io.c
diff --git a/drivers/net/s2io.h b/drivers/net/ethernet/neterion/s2io.h
similarity index 100%
rename from drivers/net/s2io.h
rename to drivers/net/ethernet/neterion/s2io.h
diff --git a/drivers/net/vxge/Makefile b/drivers/net/ethernet/neterion/vxge/Makefile
similarity index 100%
rename from drivers/net/vxge/Makefile
rename to drivers/net/ethernet/neterion/vxge/Makefile
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
similarity index 100%
rename from drivers/net/vxge/vxge-config.c
rename to drivers/net/ethernet/neterion/vxge/vxge-config.c
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
similarity index 100%
rename from drivers/net/vxge/vxge-config.h
rename to drivers/net/ethernet/neterion/vxge/vxge-config.h
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.c
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.h
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
similarity index 100%
rename from drivers/net/vxge/vxge-main.c
rename to drivers/net/ethernet/neterion/vxge/vxge-main.c
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
similarity index 100%
rename from drivers/net/vxge/vxge-main.h
rename to drivers/net/ethernet/neterion/vxge/vxge-main.h
diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/ethernet/neterion/vxge/vxge-reg.h
similarity index 100%
rename from drivers/net/vxge/vxge-reg.h
rename to drivers/net/ethernet/neterion/vxge/vxge-reg.h
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.c
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.c
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.h
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.h
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/ethernet/neterion/vxge/vxge-version.h
similarity index 100%
rename from drivers/net/vxge/vxge-version.h
rename to drivers/net/ethernet/neterion/vxge/vxge-version.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 19/71] ehea/ibm*: Move the IBM drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Christoph Raisch,
Alfred Arnold, Santiago Leon, Benjamin Herrenschmidt,
David Gibson, Kyle Lucke, Michael Ellerman
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
necessary Kconfig and Makefile changes.
- Renamed ibm_new_emac to emac
- Cleaned up Makefile and Kconfig options which referred to
IBM_NEW_EMAC to IBM_EMAC
CC: Christoph Raisch <raisch@de.ibm.com>
CC: Alfred Arnold <alfred.arnold@lancom.de>
CC: Santiago Leon <santil@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: David Gibson <dwg@au1.ibm.com>
CC: Kyle Lucke <klucke@us.ibm.com>
CC: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 41 --------------
drivers/net/Makefile | 5 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/ibm/Kconfig | 58 ++++++++++++++++++++
drivers/net/ethernet/ibm/Makefile | 9 +++
drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 42 +++++++-------
.../{ibm_newemac => ethernet/ibm/emac}/Makefile | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 0
drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
drivers/net/{ => ethernet/ibm}/iseries_veth.c | 0
38 files changed, 92 insertions(+), 69 deletions(-)
create mode 100644 drivers/net/ethernet/ibm/Kconfig
create mode 100644 drivers/net/ethernet/ibm/Makefile
rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (61%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index dc83dd9..900c8ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2452,7 +2452,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
M: Breno Leitao <leitao@linux.vnet.ibm.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ehea/
+F: drivers/net/ethernet/ibm/ehea/
EMBEDDED LINUX
M: Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -3151,7 +3151,7 @@ IBM Power Virtual Ethernet Device Driver
M: Santiago Leon <santil@linux.vnet.ibm.com>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/ibmveth.*
+F: drivers/net/ethernet/ibm/ibmveth.*
IBM ServeRAID RAID DRIVER
P: Jack Hammer
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3e216b3..f66b921 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -612,33 +612,6 @@ config SEEQ8005
To compile this driver as a module, choose M here. The module
will be called seeq8005.
-config IBMLANA
- tristate "IBM LAN Adapter/A support"
- depends on MCA
- ---help---
- This is a Micro Channel Ethernet adapter. You need to set
- CONFIG_MCA to use this driver. It is both available as an in-kernel
- driver and as a module.
-
- To compile this driver as a module, choose M here. The only
- currently supported card is the IBM LAN Adapter/A for Ethernet. It
- will both support 16K and 32K memory windows, however a 32K window
- gives a better security against packet losses. Usage of multiple
- boards with this driver should be possible, but has not been tested
- up to now due to lack of hardware.
-
-config IBMVETH
- tristate "IBM LAN Virtual Ethernet support"
- depends on PPC_PSERIES
- ---help---
- This driver supports virtual ethernet adapters on newer IBM iSeries
- and pSeries systems.
-
- To compile this driver as a module, choose M here. The module will
- be called ibmveth.
-
-source "drivers/net/ibm_newemac/Kconfig"
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
@@ -1469,16 +1442,6 @@ if NETDEV_10000
config MDIO
tristate
-config EHEA
- tristate "eHEA Ethernet support"
- depends on IBMEBUS && INET && SPARSEMEM
- select INET_LRO
- ---help---
- This driver supports the IBM pSeries eHEA ethernet adapter.
-
- To compile the driver as a module, choose M here. The module
- will be called ehea.
-
config ENIC
tristate "Cisco VIC Ethernet NIC Support"
depends on PCI && INET
@@ -1573,10 +1536,6 @@ config XEN_NETDEV_BACKEND
compile this driver as a module, chose M here: the module
will be called xen-netback.
-config ISERIES_VETH
- tristate "iSeries Virtual Ethernet driver support"
- depends on PPC_ISERIES
-
config RIONET
tristate "RapidIO Ethernet over messaging driver support"
depends on RAPIDIO
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d28c153e..60d821a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -10,9 +10,7 @@ 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_IBM_NEW_EMAC) += ibm_newemac/
obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_EHEA) += ehea/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_ATL1) += atlx/
@@ -50,7 +48,6 @@ obj-$(CONFIG_SIS190) += sis190.o
obj-$(CONFIG_SIS900) += sis900.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
-obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.o
obj-$(CONFIG_FEALNX) += fealnx.o
@@ -125,7 +122,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_IBMLANA) += ibmlana.o
obj-$(CONFIG_8139CP) += 8139cp.o
obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_CPMAC) += cpmac.o
@@ -148,7 +144,6 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 1a39ec0..f23f1b2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/neterion/Kconfig"
+source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 4c21e8f..27e4da6 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
+obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
new file mode 100644
index 0000000..3e3bd4c
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -0,0 +1,58 @@
+#
+# IBM device configuration.
+#
+
+config NET_VENDOR_IBM
+ bool "IBM devices"
+ depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \
+ (IBMEBUS && INET && SPARSEMEM)
+ ---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 IBM devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config IBMLANA
+ tristate "IBM LAN Adapter/A support"
+ depends on NET_VENDOR_IBM && MCA
+ ---help---
+ This is a Micro Channel Ethernet adapter. You need to set
+ CONFIG_MCA to use this driver. It is both available as an in-kernel
+ driver and as a module.
+
+ To compile this driver as a module, choose M here. The only
+ currently supported card is the IBM LAN Adapter/A for Ethernet. It
+ will both support 16K and 32K memory windows, however a 32K window
+ gives a better security against packet losses. Usage of multiple
+ boards with this driver should be possible, but has not been tested
+ up to now due to lack of hardware.
+
+config IBMVETH
+ tristate "IBM LAN Virtual Ethernet support"
+ depends on NET_VENDOR_IBM && PPC_PSERIES
+ ---help---
+ This driver supports virtual ethernet adapters on newer IBM iSeries
+ and pSeries systems.
+
+ To compile this driver as a module, choose M here. The module will
+ be called ibmveth.
+
+config ISERIES_VETH
+ tristate "iSeries Virtual Ethernet driver support"
+ depends on NET_VENDOR_IBM && PPC_ISERIES
+
+source "drivers/net/ethernet/ibm/emac/Kconfig"
+
+config EHEA
+ tristate "eHEA Ethernet support"
+ depends on NET_VENDOR_IBM && IBMEBUS && INET && SPARSEMEM
+ select INET_LRO
+ ---help---
+ This driver supports the IBM pSeries eHEA ethernet adapter.
+
+ To compile the driver as a module, choose M here. The module
+ will be called ehea.
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
new file mode 100644
index 0000000..7ee87d9
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for th IBM network device drivers.
+#
+
+obj-$(CONFIG_IBMLANA) += ibmlana.o
+obj-$(CONFIG_IBMVETH) += ibmveth.o
+obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
+obj-$(CONFIG_IBM_EMAC) += emac/
+obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ehea/Makefile b/drivers/net/ethernet/ibm/ehea/Makefile
similarity index 100%
rename from drivers/net/ehea/Makefile
rename to drivers/net/ethernet/ibm/ehea/Makefile
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
similarity index 100%
rename from drivers/net/ehea/ehea.h
rename to drivers/net/ethernet/ibm/ehea/ehea.h
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
similarity index 100%
rename from drivers/net/ehea/ehea_ethtool.c
rename to drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
diff --git a/drivers/net/ehea/ehea_hw.h b/drivers/net/ethernet/ibm/ehea/ehea_hw.h
similarity index 100%
rename from drivers/net/ehea/ehea_hw.h
rename to drivers/net/ethernet/ibm/ehea/ehea_hw.h
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
similarity index 100%
rename from drivers/net/ehea/ehea_main.c
rename to drivers/net/ethernet/ibm/ehea/ehea_main.c
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.c
rename to drivers/net/ethernet/ibm/ehea/ehea_phyp.c
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.h
rename to drivers/net/ethernet/ibm/ehea/ehea_phyp.h
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.c
rename to drivers/net/ethernet/ibm/ehea/ehea_qmr.c
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.h
rename to drivers/net/ethernet/ibm/ehea/ehea_qmr.h
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ethernet/ibm/emac/Kconfig
similarity index 61%
rename from drivers/net/ibm_newemac/Kconfig
rename to drivers/net/ethernet/ibm/emac/Kconfig
index 78a1628..3c0bf84 100644
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/drivers/net/ethernet/ibm/emac/Kconfig
@@ -1,35 +1,35 @@
-config IBM_NEW_EMAC
+config IBM_EMAC
tristate "IBM EMAC Ethernet support"
- depends on PPC_DCR
+ depends on NET_VENDOR_IBM && PPC_DCR
select CRC32
help
This driver supports the IBM EMAC family of Ethernet controllers
typically found on 4xx embedded PowerPC chips, but also on the
Axon southbridge for Cell.
-config IBM_NEW_EMAC_RXB
+config IBM_EMAC_RXB
int "Number of receive buffers"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default "128"
-config IBM_NEW_EMAC_TXB
+config IBM_EMAC_TXB
int "Number of transmit buffers"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default "64"
-config IBM_NEW_EMAC_POLL_WEIGHT
+config IBM_EMAC_POLL_WEIGHT
int "MAL NAPI polling weight"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default "32"
-config IBM_NEW_EMAC_RX_COPY_THRESHOLD
+config IBM_EMAC_RX_COPY_THRESHOLD
int "RX skb copy threshold (bytes)"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default "256"
-config IBM_NEW_EMAC_RX_SKB_HEADROOM
+config IBM_EMAC_RX_SKB_HEADROOM
int "Additional RX skb headroom (bytes)"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default "0"
help
Additional receive skb headroom. Note, that driver
@@ -39,38 +39,38 @@ config IBM_NEW_EMAC_RX_SKB_HEADROOM
If unsure, set to 0.
-config IBM_NEW_EMAC_DEBUG
+config IBM_EMAC_DEBUG
bool "Debugging"
- depends on IBM_NEW_EMAC
+ depends on IBM_EMAC
default n
# The options below has to be select'ed by the respective
# processor types or platforms
-config IBM_NEW_EMAC_ZMII
+config IBM_EMAC_ZMII
bool
default n
-config IBM_NEW_EMAC_RGMII
+config IBM_EMAC_RGMII
bool
default n
-config IBM_NEW_EMAC_TAH
+config IBM_EMAC_TAH
bool
default n
-config IBM_NEW_EMAC_EMAC4
+config IBM_EMAC_EMAC4
bool
default n
-config IBM_NEW_EMAC_NO_FLOW_CTRL
+config IBM_EMAC_NO_FLOW_CTRL
bool
default n
-config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+config IBM_EMAC_MAL_CLR_ICINTSTAT
bool
default n
-config IBM_NEW_EMAC_MAL_COMMON_ERR
+config IBM_EMAC_MAL_COMMON_ERR
bool
default n
diff --git a/drivers/net/ibm_newemac/Makefile b/drivers/net/ethernet/ibm/emac/Makefile
similarity index 100%
rename from drivers/net/ibm_newemac/Makefile
rename to drivers/net/ethernet/ibm/emac/Makefile
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ethernet/ibm/emac/core.c
similarity index 100%
rename from drivers/net/ibm_newemac/core.c
rename to drivers/net/ethernet/ibm/emac/core.c
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ethernet/ibm/emac/core.h
similarity index 100%
rename from drivers/net/ibm_newemac/core.h
rename to drivers/net/ethernet/ibm/emac/core.h
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ethernet/ibm/emac/debug.c
similarity index 100%
rename from drivers/net/ibm_newemac/debug.c
rename to drivers/net/ethernet/ibm/emac/debug.c
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ethernet/ibm/emac/debug.h
similarity index 100%
rename from drivers/net/ibm_newemac/debug.h
rename to drivers/net/ethernet/ibm/emac/debug.h
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h
similarity index 100%
rename from drivers/net/ibm_newemac/emac.h
rename to drivers/net/ethernet/ibm/emac/emac.h
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
similarity index 100%
rename from drivers/net/ibm_newemac/mal.c
rename to drivers/net/ethernet/ibm/emac/mal.c
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ethernet/ibm/emac/mal.h
similarity index 100%
rename from drivers/net/ibm_newemac/mal.h
rename to drivers/net/ethernet/ibm/emac/mal.h
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ethernet/ibm/emac/phy.c
similarity index 100%
rename from drivers/net/ibm_newemac/phy.c
rename to drivers/net/ethernet/ibm/emac/phy.c
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ethernet/ibm/emac/phy.h
similarity index 100%
rename from drivers/net/ibm_newemac/phy.h
rename to drivers/net/ethernet/ibm/emac/phy.h
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.c
rename to drivers/net/ethernet/ibm/emac/rgmii.c
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ethernet/ibm/emac/rgmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.h
rename to drivers/net/ethernet/ibm/emac/rgmii.h
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
similarity index 100%
rename from drivers/net/ibm_newemac/tah.c
rename to drivers/net/ethernet/ibm/emac/tah.c
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ethernet/ibm/emac/tah.h
similarity index 100%
rename from drivers/net/ibm_newemac/tah.h
rename to drivers/net/ethernet/ibm/emac/tah.h
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.c
rename to drivers/net/ethernet/ibm/emac/zmii.c
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ethernet/ibm/emac/zmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.h
rename to drivers/net/ethernet/ibm/emac/zmii.h
diff --git a/drivers/net/ibmlana.c b/drivers/net/ethernet/ibm/ibmlana.c
similarity index 100%
rename from drivers/net/ibmlana.c
rename to drivers/net/ethernet/ibm/ibmlana.c
diff --git a/drivers/net/ibmlana.h b/drivers/net/ethernet/ibm/ibmlana.h
similarity index 100%
rename from drivers/net/ibmlana.h
rename to drivers/net/ethernet/ibm/ibmlana.h
diff --git a/drivers/net/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
similarity index 100%
rename from drivers/net/ibmveth.c
rename to drivers/net/ethernet/ibm/ibmveth.c
diff --git a/drivers/net/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h
similarity index 100%
rename from drivers/net/ibmveth.h
rename to drivers/net/ethernet/ibm/ibmveth.h
diff --git a/drivers/net/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c
similarity index 100%
rename from drivers/net/iseries_veth.c
rename to drivers/net/ethernet/ibm/iseries_veth.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 21/71] pasemic_mac*: Move the PA Semi driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Olof Johansson
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the PA Semi driver into drivers/net/ethernet/pasemi/ and
make the necessary Kconfig and Makefile changes.
CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Olof Johansson <olof@lixom.net>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 9 -------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/pasemi/Kconfig | 25 ++++++++++++++++++++
drivers/net/ethernet/pasemi/Makefile | 5 ++++
drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 0
drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0
.../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0
10 files changed, 33 insertions(+), 12 deletions(-)
create mode 100644 drivers/net/ethernet/pasemi/Kconfig
create mode 100644 drivers/net/ethernet/pasemi/Makefile
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (100%)
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e3d41a5..da22b40 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4758,7 +4758,7 @@ PA SEMI ETHERNET DRIVER
M: Olof Johansson <olof@lixom.net>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/pasemi_mac.*
+F: drivers/net/ethernet/pasemi/*
PA SEMI SMBUS DRIVER
M: Olof Johansson <olof@lixom.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3090c98..becb786 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1442,15 +1442,6 @@ if NETDEV_10000
config MDIO
tristate
-config PASEMI_MAC
- tristate "PA Semi 1/10Gbit MAC"
- depends on PPC_PASEMI && PCI && INET
- select PHYLIB
- select INET_LRO
- help
- This driver supports the on-chip 1/10Gbit Ethernet controller on
- PA Semi's PWRficient line of chips.
-
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2a50b73..b396475 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -146,8 +146,6 @@ obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
-obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
-pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 18b634e..16c206e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -25,6 +25,7 @@ source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
+source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 288179b..a52dc26 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/pasemi/Kconfig b/drivers/net/ethernet/pasemi/Kconfig
new file mode 100644
index 0000000..97beb45
--- /dev/null
+++ b/drivers/net/ethernet/pasemi/Kconfig
@@ -0,0 +1,25 @@
+#
+# PA Semi network device configuration
+#
+
+config NET_VENDOR_PASEMI
+ bool "PA Semi devices"
+ depends on PPC_PASEMI && 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 PA Semi cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config PASEMI_MAC
+ tristate "PA Semi 1/10Gbit MAC"
+ depends on NET_VENDOR_PASEMI && PPC_PASEMI && PCI && INET
+ select PHYLIB
+ select INET_LRO
+ ---help---
+ This driver supports the on-chip 1/10Gbit Ethernet controller on
+ PA Semi's PWRficient line of chips.
diff --git a/drivers/net/ethernet/pasemi/Makefile b/drivers/net/ethernet/pasemi/Makefile
new file mode 100644
index 0000000..05db543
--- /dev/null
+++ b/drivers/net/ethernet/pasemi/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the A Semi network device drivers.
+#
+
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
similarity index 100%
rename from drivers/net/pasemi_mac.c
rename to drivers/net/ethernet/pasemi/pasemi_mac.c
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h
similarity index 100%
rename from drivers/net/pasemi_mac.h
rename to drivers/net/ethernet/pasemi/pasemi_mac.h
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c
similarity index 100%
rename from drivers/net/pasemi_mac_ethtool.c
rename to drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c
--
1.7.6
^ permalink raw reply related
* [net-next v2 20/71] enic: Move the Cisco driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Scott Feldman,
Christian Benvenuti, Vasanthy Kolluri, Roopa Prabhu, David Wang
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.
CC: Scott Feldman <scofeldm@cisco.com>
CC: Christian Benvenuti <benve@cisco.com>
CC: Vasanthy Kolluri <vkolluri@cisco.com>
CC: Roopa Prabhu <roprabhu@cisco.com>
CC: David Wang <dwang2@cisco.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 6 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/cisco/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/cisco/Makefile | 5 +++++
drivers/net/ethernet/cisco/enic/Kconfig | 9 +++++++++
drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
.../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
.../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
| 0
drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
.../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
39 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 drivers/net/ethernet/cisco/Kconfig
create mode 100644 drivers/net/ethernet/cisco/Makefile
create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 900c8ff..e3d41a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1754,7 +1754,7 @@ M: Vasanthy Kolluri <vkolluri@cisco.com>
M: Roopa Prabhu <roprabhu@cisco.com>
M: David Wang <dwang2@cisco.com>
S: Supported
-F: drivers/net/enic/
+F: drivers/net/ethernet/cisco/enic/
CIRRUS LOGIC EP93XX ETHERNET DRIVER
M: Hartley Sweeten <hsweeten@visionengravers.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f66b921..3090c98 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1442,12 +1442,6 @@ if NETDEV_10000
config MDIO
tristate
-config ENIC
- tristate "Cisco VIC Ethernet NIC Support"
- depends on PCI && INET
- help
- This enables the support for the Cisco VIC Ethernet card.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 60d821a..2a50b73 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
obj-$(CONFIG_TEHUTI) += tehuti.o
-obj-$(CONFIG_ENIC) += enic/
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f23f1b2..18b634e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/cisco/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/neterion/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 27e4da6..288179b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
new file mode 100644
index 0000000..6d72c34
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Kconfig
@@ -0,0 +1,18 @@
+#
+# Cisco device configuration
+#
+
+config NET_VENDOR_CISCO
+ bool "Cisco 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 Cisco cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
diff --git a/drivers/net/ethernet/cisco/Makefile b/drivers/net/ethernet/cisco/Makefile
new file mode 100644
index 0000000..6c7437b
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig
new file mode 100644
index 0000000..dc137af
--- /dev/null
+++ b/drivers/net/ethernet/cisco/enic/Kconfig
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+ tristate "Cisco VIC Ethernet NIC Support"
+ depends on NET_VENDOR_CISCO && PCI && INET
+ ---help---
+ This enables the support for the Cisco VIC Ethernet card.
diff --git a/drivers/net/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile
similarity index 100%
rename from drivers/net/enic/Makefile
rename to drivers/net/ethernet/cisco/enic/Makefile
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h
similarity index 100%
rename from drivers/net/enic/cq_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_desc.h
diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/cq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_enet_desc.h
diff --git a/drivers/net/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
similarity index 100%
rename from drivers/net/enic/enic.h
rename to drivers/net/ethernet/cisco/enic/enic.h
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c
similarity index 100%
rename from drivers/net/enic/enic_dev.c
rename to drivers/net/ethernet/cisco/enic/enic_dev.c
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h
similarity index 100%
rename from drivers/net/enic/enic_dev.h
rename to drivers/net/ethernet/cisco/enic/enic_dev.h
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
similarity index 100%
rename from drivers/net/enic/enic_main.c
rename to drivers/net/ethernet/cisco/enic/enic_main.c
diff --git a/drivers/net/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
similarity index 100%
rename from drivers/net/enic/enic_pp.c
rename to drivers/net/ethernet/cisco/enic/enic_pp.c
diff --git a/drivers/net/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h
similarity index 100%
rename from drivers/net/enic/enic_pp.h
rename to drivers/net/ethernet/cisco/enic/enic_pp.h
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c
similarity index 100%
rename from drivers/net/enic/enic_res.c
rename to drivers/net/ethernet/cisco/enic/enic_res.c
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h
similarity index 100%
rename from drivers/net/enic/enic_res.h
rename to drivers/net/ethernet/cisco/enic/enic_res.h
diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/rq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/rq_enet_desc.h
diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c
similarity index 100%
rename from drivers/net/enic/vnic_cq.c
rename to drivers/net/ethernet/cisco/enic/vnic_cq.c
diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h
similarity index 100%
rename from drivers/net/enic/vnic_cq.h
rename to drivers/net/ethernet/cisco/enic/vnic_cq.h
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
similarity index 100%
rename from drivers/net/enic/vnic_dev.c
rename to drivers/net/ethernet/cisco/enic/vnic_dev.c
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h
similarity index 100%
rename from drivers/net/enic/vnic_dev.h
rename to drivers/net/ethernet/cisco/enic/vnic_dev.h
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h
similarity index 100%
rename from drivers/net/enic/vnic_devcmd.h
rename to drivers/net/ethernet/cisco/enic/vnic_devcmd.h
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h
similarity index 100%
rename from drivers/net/enic/vnic_enet.h
rename to drivers/net/ethernet/cisco/enic/vnic_enet.h
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c
similarity index 100%
rename from drivers/net/enic/vnic_intr.c
rename to drivers/net/ethernet/cisco/enic/vnic_intr.c
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h
similarity index 100%
rename from drivers/net/enic/vnic_intr.h
rename to drivers/net/ethernet/cisco/enic/vnic_intr.h
diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h
similarity index 100%
rename from drivers/net/enic/vnic_nic.h
rename to drivers/net/ethernet/cisco/enic/vnic_nic.h
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h
similarity index 100%
rename from drivers/net/enic/vnic_resource.h
rename to drivers/net/ethernet/cisco/enic/vnic_resource.h
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
similarity index 100%
rename from drivers/net/enic/vnic_rq.c
rename to drivers/net/ethernet/cisco/enic/vnic_rq.c
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h
similarity index 100%
rename from drivers/net/enic/vnic_rq.h
rename to drivers/net/ethernet/cisco/enic/vnic_rq.h
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h
similarity index 100%
rename from drivers/net/enic/vnic_rss.h
rename to drivers/net/ethernet/cisco/enic/vnic_rss.h
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h
similarity index 100%
rename from drivers/net/enic/vnic_stats.h
rename to drivers/net/ethernet/cisco/enic/vnic_stats.h
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c
similarity index 100%
rename from drivers/net/enic/vnic_vic.c
rename to drivers/net/ethernet/cisco/enic/vnic_vic.c
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h
similarity index 100%
rename from drivers/net/enic/vnic_vic.h
rename to drivers/net/ethernet/cisco/enic/vnic_vic.h
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
similarity index 100%
rename from drivers/net/enic/vnic_wq.c
rename to drivers/net/ethernet/cisco/enic/vnic_wq.c
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h
similarity index 100%
rename from drivers/net/enic/vnic_wq.h
rename to drivers/net/ethernet/cisco/enic/vnic_wq.h
diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/wq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/wq_enet_desc.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 22/71] tehuti: Move the Tehuti driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Alexander Indenbaum,
Andy Gospodarek
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Tehuti driver into drivers/net/ethernet/tehuti/ and
make the necessary Kconfig and Makefile changes.
CC: Alexander Indenbaum <baum@tehutinetworks.net>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 6 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/tehuti/Kconfig | 22 ++++++++++++++++++++++
drivers/net/ethernet/tehuti/Makefile | 5 +++++
drivers/net/{ => ethernet/tehuti}/tehuti.c | 0
drivers/net/{ => ethernet/tehuti}/tehuti.h | 0
9 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 drivers/net/ethernet/tehuti/Kconfig
create mode 100644 drivers/net/ethernet/tehuti/Makefile
rename drivers/net/{ => ethernet/tehuti}/tehuti.c (100%)
rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index da22b40..05e51e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6182,7 +6182,7 @@ M: Alexander Indenbaum <baum@tehutinetworks.net>
M: Andy Gospodarek <andy@greyhouse.net>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/tehuti*
+F: drivers/net/ethernet/tehuti/*
Telecom Clock Driver for MCPL0010
M: Mark Gross <mark.gross@intel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index becb786..9a294bd 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1442,12 +1442,6 @@ if NETDEV_10000
config MDIO
tristate
-config TEHUTI
- tristate "Tehuti Networks 10G Ethernet"
- depends on PCI
- help
- Tehuti Networks 10G Ethernet NIC
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b396475..f82495a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/
obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
-obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 16c206e..8375b8b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -31,5 +31,6 @@ source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
+source "drivers/net/ethernet/tehuti/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a52dc26..26324a1 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig
new file mode 100644
index 0000000..f5e3d1f
--- /dev/null
+++ b/drivers/net/ethernet/tehuti/Kconfig
@@ -0,0 +1,22 @@
+#
+# Tehuti network device configuration
+#
+
+config NET_VENDOR_TEHUTI
+ bool "Tehuti 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 Tehuti cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config TEHUTI
+ tristate "Tehuti Networks 10G Ethernet"
+ depends on NET_VENDOR_TEHUTI && PCI
+ ---help---
+ Tehuti Networks 10G Ethernet NIC
diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile
new file mode 100644
index 0000000..f995421
--- /dev/null
+++ b/drivers/net/ethernet/tehuti/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Tehuti network device drivers.
+#
+
+obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
similarity index 100%
rename from drivers/net/tehuti.c
rename to drivers/net/ethernet/tehuti/tehuti.c
diff --git a/drivers/net/tehuti.h b/drivers/net/ethernet/tehuti/tehuti.h
similarity index 100%
rename from drivers/net/tehuti.h
rename to drivers/net/ethernet/tehuti/tehuti.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 23/71] stmmac: Move the STMicroelectronics driver
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, Giuseppe Cavallaro
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and
make the necessary Kconfig and Makefile changes.
CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/stmicro/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/stmicro/Makefile | 5 +++++
drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 +++++++-------
drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 0
drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 0
drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
.../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
.../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
27 files changed, 33 insertions(+), 11 deletions(-)
create mode 100644 drivers/net/ethernet/stmicro/Kconfig
create mode 100644 drivers/net/ethernet/stmicro/Makefile
rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 05e51e2..f16acae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2016,7 +2016,7 @@ M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
L: netdev@vger.kernel.org
W: http://www.stlinux.com
S: Supported
-F: drivers/net/stmmac/
+F: drivers/net/ethernet/stmicro/stmmac/
CYBERPRO FB DRIVER
M: Russell King <linux@arm.linux.org.uk>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9a294bd..7eb052b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1391,8 +1391,6 @@ config S6GMAC
To compile this driver as a module, choose M here. The module
will be called s6gmac.
-source "drivers/net/stmmac/Kconfig"
-
config PCH_GBE
tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f82495a..b322cde 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -67,7 +67,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_SH_ETH) += sh_eth.o
-obj-$(CONFIG_STMMAC_ETH) += stmmac/
#
# end link order section
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8375b8b..c38e902 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -30,6 +30,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
+source "drivers/net/ethernet/stmicro/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
source "drivers/net/ethernet/tehuti/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 26324a1..75d7a02 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,5 +21,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
+obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
diff --git a/drivers/net/ethernet/stmicro/Kconfig b/drivers/net/ethernet/stmicro/Kconfig
new file mode 100644
index 0000000..d4f7e02
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Kconfig
@@ -0,0 +1,18 @@
+#
+# STMicroelectronics device configuration
+#
+
+config NET_VENDOR_STMICRO
+ bool "STMicroelectronics devices"
+ depends on HAS_IOMEM
+ ---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 STMicroelectronics cards. If you say Y, you will
+ be asked for your specific card in the following questions.
+
+source "drivers/net/ethernet/stmicro/stmmac/Kconfig"
diff --git a/drivers/net/ethernet/stmicro/Makefile b/drivers/net/ethernet/stmicro/Makefile
new file mode 100644
index 0000000..9b3bfdd
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the STMicroelectronics device drivers.
+#
+
+obj-$(CONFIG_STMMAC_ETH) += stmmac/
diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
similarity index 92%
rename from drivers/net/stmmac/Kconfig
rename to drivers/net/ethernet/stmicro/stmmac/Kconfig
index 7df7df4..e1d915d 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -1,10 +1,10 @@
config STMMAC_ETH
tristate "STMicroelectronics 10/100/1000 Ethernet driver"
+ depends on NET_VENDOR_STMICRO && HAS_IOMEM
select MII
select PHYLIB
select CRC32
- depends on NETDEVICES && HAS_IOMEM
- help
+ ---help---
This is the driver for the Ethernet IPs are built around a
Synopsys IP Core and only tested on the STMicroelectronics
platforms.
@@ -14,7 +14,7 @@ if STMMAC_ETH
config STMMAC_DA
bool "STMMAC DMA arbitration scheme"
default n
- help
+ ---help---
Selecting this option, rx has priority over Tx (only for Giga
Ethernet device).
By default, the DMA arbitration scheme is based on Round-robin
@@ -24,7 +24,7 @@ config STMMAC_DUAL_MAC
bool "STMMAC: dual mac support (EXPERIMENTAL)"
default n
depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
- help
+ ---help---
Some ST SoCs (for example the stx7141 and stx7200c2) have two
Ethernet Controllers. This option turns on the second Ethernet
device on this kind of platforms.
@@ -33,7 +33,7 @@ config STMMAC_TIMER
bool "STMMAC Timer optimisation"
default n
depends on RTC_HCTOSYS_DEVICE
- help
+ ---help---
Use an external timer for mitigating the number of network
interrupts. Currently, for SH architectures, it is possible
to use the TMU channel 2 and the SH-RTC device.
@@ -45,12 +45,12 @@ choice
config STMMAC_TMU_TIMER
bool "TMU channel 2"
depends on CPU_SH4
- help
+ ---help---
config STMMAC_RTC_TIMER
bool "Real time clock"
depends on RTC_CLASS
- help
+ ---help---
endchoice
diff --git a/drivers/net/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
similarity index 100%
rename from drivers/net/stmmac/Makefile
rename to drivers/net/ethernet/stmicro/stmmac/Makefile
diff --git a/drivers/net/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
similarity index 100%
rename from drivers/net/stmmac/common.h
rename to drivers/net/ethernet/stmicro/stmmac/common.h
diff --git a/drivers/net/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
similarity index 100%
rename from drivers/net/stmmac/descs.h
rename to drivers/net/ethernet/stmicro/stmmac/descs.h
diff --git a/drivers/net/stmmac/dwmac100.h b/drivers/net/ethernet/stmicro/stmmac/dwmac100.h
similarity index 100%
rename from drivers/net/stmmac/dwmac100.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100.h
diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
similarity index 100%
rename from drivers/net/stmmac/dwmac1000.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
diff --git a/drivers/net/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
diff --git a/drivers/net/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
similarity index 100%
rename from drivers/net/stmmac/dwmac_dma.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
diff --git a/drivers/net/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
similarity index 100%
rename from drivers/net/stmmac/dwmac_lib.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
similarity index 100%
rename from drivers/net/stmmac/enh_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/enh_desc.c
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
similarity index 100%
rename from drivers/net/stmmac/norm_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/norm_desc.c
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
similarity index 100%
rename from drivers/net/stmmac/stmmac.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac.h
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_ethtool.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_main.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_mdio.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
diff --git a/drivers/net/stmmac/stmmac_timer.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
diff --git a/drivers/net/stmmac/stmmac_timer.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
--
1.7.6
^ permalink raw reply related
* [net-next v2 24/71] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
From: Jeff Kirsher @ 2011-07-31 3:26 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Paul Mackerras,
Paul Mackerras, Russell Nelson
In-Reply-To: <1312082850-24914-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Apple drivers into driver/net/ethernet/apple/ and make the
necessary Kconfig and Makefile changes.
CC: Paul Mackerras <paulus@samba.org>
CC: Paul Mackerras <paulus@au.ibm.com>
CC: Russell Nelson <nelson@crynwr.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 75 ----------------------
drivers/net/Makefile | 6 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
drivers/net/ethernet/apple/Makefile | 9 +++
drivers/net/{ => ethernet/apple}/bmac.c | 0
drivers/net/{ => ethernet/apple}/bmac.h | 0
drivers/net/{ => ethernet/apple}/cs89x0.c | 0
drivers/net/{ => ethernet/apple}/cs89x0.h | 0
drivers/net/{ => ethernet/apple}/mac89x0.c | 0
drivers/net/{ => ethernet/apple}/mace.c | 0
drivers/net/{ => ethernet/apple}/mace.h | 0
drivers/net/{ => ethernet/apple}/macmace.c | 0
14 files changed, 103 insertions(+), 81 deletions(-)
create mode 100644 drivers/net/ethernet/apple/Kconfig
create mode 100644 drivers/net/ethernet/apple/Makefile
rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.h (100%)
rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7eb052b..8e6f8d4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,52 +237,6 @@ config MACB
source "drivers/net/arm/Kconfig"
-config MACE
- tristate "MACE (Power Mac ethernet) support"
- depends on PPC_PMAC && PPC32
- select CRC32
- help
- Power Macintoshes and clones with Ethernet built-in on the
- motherboard will usually use a MACE (Medium Access Control for
- Ethernet) interface. Say Y to include support for the MACE chip.
-
- To compile this driver as a module, choose M here: the module
- will be called mace.
-
-config MACE_AAUI_PORT
- bool "Use AAUI port instead of TP by default"
- depends on MACE
- help
- Some Apple machines (notably the Apple Network Server) which use the
- MACE ethernet chip have an Apple AUI port (small 15-pin connector),
- instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
- Y here if you have such a machine. If unsure, say N.
- The driver will default to AAUI on ANS anyway, and if you use it as
- a module, you can provide the port_aaui=0|1 to force the driver.
-
-config BMAC
- tristate "BMAC (G3 ethernet) support"
- depends on PPC_PMAC && PPC32
- select CRC32
- help
- Say Y for support of BMAC Ethernet interfaces. These are used on G3
- computers.
-
- To compile this driver as a module, choose M here: the module
- will be called bmac.
-
-config MAC89x0
- tristate "Macintosh CS89x0 based ethernet cards"
- depends on MAC
- ---help---
- Support for CS89x0 chipset based Ethernet cards. If you have a
- Nubus or LC-PDS 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. This module will
- be called mac89x0.
-
config MACSONIC
tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
depends on MAC
@@ -296,16 +250,6 @@ config MACSONIC
To compile this driver as a module, choose M here. This module will
be called macsonic.
-config MACMACE
- bool "Macintosh (AV) onboard MACE ethernet"
- depends on MAC
- select CRC32
- help
- Support for the onboard AMD 79C940 MACE Ethernet controller used in
- the 660AV and 840AV Macintosh. If you have one of these Macintoshes
- say Y and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
config KORINA
tristate "Korina (IDT RC32434) Ethernet support"
depends on NET_ETHERNET && MIKROTIK_RB532
@@ -662,25 +606,6 @@ config FORCEDETH
To compile this driver as a module, choose M here. The module
will be called forcedeth.
-config CS89x0
- tristate "CS89x0 support"
- depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
- || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
- ---help---
- Support for CS89x0 chipset based Ethernet cards. 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:Documentation/networking/cs89x0.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called cs89x0.
-
-config CS89x0_NONISA_IRQ
- def_bool y
- depends on CS89x0 != n
- depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
-
config TC35815
tristate "TOSHIBA TC35815 Ethernet support"
depends on NET_PCI && PCI && MIPS
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b322cde..7d233c8 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -38,9 +38,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_MACE) += mace.o
-obj-$(CONFIG_BMAC) += bmac.o
-
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_SIS190) += sis190.o
obj-$(CONFIG_SIS900) += sis900.o
@@ -132,10 +129,7 @@ obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_CS89x0) += cs89x0.o
obj-$(CONFIG_MACSONIC) += macsonic.o
-obj-$(CONFIG_MACMACE) += macmace.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c38e902..c3c415d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/apple/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 75d7a02..b67b88d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
new file mode 100644
index 0000000..018fab6
--- /dev/null
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -0,0 +1,92 @@
+#
+# Apple device configuration
+#
+
+config NET_VENDOR_APPLE
+ bool "Apple devices"
+ depends on PPC_PMAC || PPC32 || MAC || ISA || EISA || MACH_IXDP2351 \
+ || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
+ ---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 IBM devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config MACE
+ tristate "MACE (Power Mac ethernet) support"
+ depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+ select CRC32
+ ---help---
+ Power Macintoshes and clones with Ethernet built-in on the
+ motherboard will usually use a MACE (Medium Access Control for
+ Ethernet) interface. Say Y to include support for the MACE chip.
+
+ To compile this driver as a module, choose M here: the module
+ will be called mace.
+
+config MACE_AAUI_PORT
+ bool "Use AAUI port instead of TP by default"
+ depends on MACE
+ ---help---
+ Some Apple machines (notably the Apple Network Server) which use the
+ MACE ethernet chip have an Apple AUI port (small 15-pin connector),
+ instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
+ Y here if you have such a machine. If unsure, say N.
+ The driver will default to AAUI on ANS anyway, and if you use it as
+ a module, you can provide the port_aaui=0|1 to force the driver.
+
+config BMAC
+ tristate "BMAC (G3 ethernet) support"
+ depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+ select CRC32
+ ---help---
+ Say Y for support of BMAC Ethernet interfaces. These are used on G3
+ computers.
+
+ To compile this driver as a module, choose M here: the module
+ will be called bmac.
+
+config MAC89x0
+ tristate "Macintosh CS89x0 based ethernet cards"
+ depends on NET_VENDOR_APPLE && MAC
+ ---help---
+ Support for CS89x0 chipset based Ethernet cards. If you have a
+ Nubus or LC-PDS 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. This module will
+ be called mac89x0.
+
+config MACMACE
+ bool "Macintosh (AV) onboard MACE ethernet"
+ depends on NET_VENDOR_APPLE && MAC
+ select CRC32
+ ---help---
+ Support for the onboard AMD 79C940 MACE Ethernet controller used in
+ the 660AV and 840AV Macintosh. If you have one of these Macintoshes
+ say Y and read the Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+config CS89x0
+ tristate "CS89x0 support"
+ depends on NET_VENDOR_APPLE && (ISA || EISA || MACH_IXDP2351 \
+ || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
+ ---help---
+ Support for CS89x0 chipset based Ethernet cards. 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:Documentation/networking/cs89x0.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called cs89x0.
+
+config CS89x0_NONISA_IRQ
+ def_bool y
+ depends on CS89x0 != n
+ depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
new file mode 100644
index 0000000..9d30086
--- /dev/null
+++ b/drivers/net/ethernet/apple/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the Apple network device drivers.
+#
+
+obj-$(CONFIG_MACE) += mace.o
+obj-$(CONFIG_BMAC) += bmac.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
+obj-$(CONFIG_CS89x0) += cs89x0.o
+obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/bmac.c b/drivers/net/ethernet/apple/bmac.c
similarity index 100%
rename from drivers/net/bmac.c
rename to drivers/net/ethernet/apple/bmac.c
diff --git a/drivers/net/bmac.h b/drivers/net/ethernet/apple/bmac.h
similarity index 100%
rename from drivers/net/bmac.h
rename to drivers/net/ethernet/apple/bmac.h
diff --git a/drivers/net/cs89x0.c b/drivers/net/ethernet/apple/cs89x0.c
similarity index 100%
rename from drivers/net/cs89x0.c
rename to drivers/net/ethernet/apple/cs89x0.c
diff --git a/drivers/net/cs89x0.h b/drivers/net/ethernet/apple/cs89x0.h
similarity index 100%
rename from drivers/net/cs89x0.h
rename to drivers/net/ethernet/apple/cs89x0.h
diff --git a/drivers/net/mac89x0.c b/drivers/net/ethernet/apple/mac89x0.c
similarity index 100%
rename from drivers/net/mac89x0.c
rename to drivers/net/ethernet/apple/mac89x0.c
diff --git a/drivers/net/mace.c b/drivers/net/ethernet/apple/mace.c
similarity index 100%
rename from drivers/net/mace.c
rename to drivers/net/ethernet/apple/mace.c
diff --git a/drivers/net/mace.h b/drivers/net/ethernet/apple/mace.h
similarity index 100%
rename from drivers/net/mace.h
rename to drivers/net/ethernet/apple/mace.h
diff --git a/drivers/net/macmace.c b/drivers/net/ethernet/apple/macmace.c
similarity index 100%
rename from drivers/net/macmace.c
rename to drivers/net/ethernet/apple/macmace.c
--
1.7.6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox