From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
netdev@vger.kernel.org, Donald Becker <becker@scyld.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Alain Malek <alain.malek@cryogen.com>,
Peter De Schrijver <p2@mind.be>,
"David Huggins-Daines" <dhd@debian.org>,
Wim Dumon <wimpie@kotnet.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
David Hinds <dahinds@users.sourceforge.net>
Subject: [RFC 04/72] 8390: Move the 8390 related drivers
Date: Sat, 25 Jun 2011 06:58:15 -0700 [thread overview]
Message-ID: <1309010363-22750-5-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1309010363-22750-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>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 5 +-
drivers/net/Kconfig | 283 -------------------
drivers/net/Makefile | 22 --
drivers/net/ethernet/3com/Makefile | 2 +-
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 | 324 ++++++++++++++++++++++
drivers/net/ethernet/8390/Makefile | 27 ++
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/{ => 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 -
37 files changed, 358 insertions(+), 334 deletions(-)
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/{ => 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 e155522..87e8a415 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -169,8 +169,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>
@@ -6332,7 +6331,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 28abb09..7ed3025 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
@@ -308,50 +292,6 @@ config A2065
To compile this driver as a module, choose M here: the module
will be called a2065.
-config HYDRA
- tristate "Hydra support"
- depends on ZORRO
- select CRC32
- help
- If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
-
- To compile this driver as a module, choose M here: the module
- will be called hydra.
-
-config ZORRO8390
- tristate "Zorro NS8390-based Ethernet support"
- depends on ZORRO
- select CRC32
- help
- This driver is for Zorro Ethernet cards using an NS8390-compatible
- chipset, like the Village Tronic Ariadne II and the Individual
- Computers X-Surf Ethernet cards. If you have such a card, say Y.
- Otherwise, say N.
-
- To compile this driver as a module, choose M here: the module
- will be called zorro8390.
-
-config APNE
- tristate "PCMCIA NE2000 support"
- depends on AMIGA_PCMCIA
- select CRC32
- help
- If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise,
- say N.
-
- To compile this driver as a module, choose M here: the module
- will be called apne.
-
-config MAC8390
- bool "Macintosh NS 8390 based ethernet cards"
- depends on MAC
- select CRC32
- help
- If you want to include a driver to support Nubus or LC-PDS
- Ethernet cards using an NS8390 chipset or its equivalent, say Y
- and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
config MAC89x0
tristate "Macintosh CS89x0 based ethernet cards"
depends on MAC
@@ -479,18 +419,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 && \
@@ -564,74 +492,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)
@@ -976,18 +836,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
@@ -1029,30 +877,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
@@ -1072,26 +896,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
@@ -1113,18 +917,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
@@ -1180,18 +972,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
@@ -1307,18 +1087,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
@@ -1339,50 +1107,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
@@ -1727,13 +1451,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 f70087d..2ad4579 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
@@ -123,23 +118,9 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
endif
obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_WD80x3) += wd.o 8390.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
@@ -193,7 +174,6 @@ 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
obj-$(CONFIG_SNI_82596) += sni_82596.o
@@ -205,7 +185,6 @@ 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
@@ -213,7 +192,6 @@ 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_A2065) += a2065.o
-obj-$(CONFIG_HYDRA) += hydra.o
obj-$(CONFIG_ARIADNE) += ariadne.o
obj-$(CONFIG_CS89x0) += cs89x0.o
obj-$(CONFIG_MACSONIC) += macsonic.o
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
index a86fdac..5117f87 100644
--- a/drivers/net/ethernet/3com/Makefile
+++ b/drivers/net/ethernet/3com/Makefile
@@ -3,7 +3,7 @@
#
obj-$(CONFIG_EL1) += 3c501.o
-obj-$(CONFIG_EL2) += 3c503.o ../../8390p.o
+obj-$(CONFIG_EL2) += 3c503.o ../8390/8390p.o
obj-$(CONFIG_ELPLUS) += 3c505.o
obj-$(CONFIG_EL16) += 3c507.o
obj-$(CONFIG_EL3) += 3c509.o
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..3c20f26
--- /dev/null
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -0,0 +1,324 @@
+#
+# 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 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 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 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 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 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..3c94187
--- /dev/null
+++ b/drivers/net/ethernet/8390/Makefile
@@ -0,0 +1,27 @@
+#
+# Makefile for the 8390 network device drivers.
+#
+
+obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o
+obj-$(CONFIG_MAC8390) += mac8390.o
+obj-$(CONFIG_AC3200) += ac3200.o 8390.o
+obj-$(CONFIG_APNE) += apne.o 8390.o
+obj-$(CONFIG_AX88796) += ax88796.o
+obj-$(CONFIG_E2100) += e2100.o 8390.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_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/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 b67c5ed..65c98c6 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_NMCLAN
tristate "New Media PCMCIA support"
help
@@ -70,17 +60,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 2f2ab3b..28b633e 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -5,10 +5,8 @@
# 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
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
--
1.7.5.4
next prev parent reply other threads:[~2011-06-25 13:59 UTC|newest]
Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
2011-06-25 13:58 ` [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option Jeff Kirsher
2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
2011-06-25 16:11 ` David Dillow
2011-06-28 8:22 ` Alan Cox
2011-07-09 15:27 ` Jeff Kirsher
2011-06-25 13:58 ` [RFC 03/72] amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers Jeff Kirsher
2011-06-25 13:58 ` Jeff Kirsher [this message]
2011-06-25 13:58 ` [RFC 05/72] broadcom: Move the Broadcom drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 06/72] chelsio: Move the Chelsio drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 07/72] intel: Move the Intel wired LAN drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 08/72] qlogic: Move the QLogic drivers Jeff Kirsher
2011-06-27 1:30 ` Anirban Chakraborty
2011-06-25 13:58 ` [RFC 09/72] smc: Move the SMC drivers Jeff Kirsher
2011-06-25 14:30 ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 10/72] ni5*/ni65: Move the Racal-Interlan (Micom) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 11/72] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
2011-06-25 14:46 ` Oliver Hartkopp
2011-06-25 23:56 ` David Miller
2011-06-25 13:58 ` [RFC 12/72] sfc: Move the Solarflare drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 13/72] be2net: Move the Emulex driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 14/72] bna: Move the Brocade driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 15/72] mlx4: Move the Mellanox driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 16/72] myri*: Move the Myricom drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 17/72] s2io/vxge: Move the Exar drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 18/72] ehea/ibm*: Move the IBM drivers Jeff Kirsher
2011-06-25 14:39 ` Oliver Hartkopp
2011-06-25 15:04 ` Arnd Bergmann
2011-06-26 0:37 ` Benjamin Herrenschmidt
2011-06-25 13:58 ` [RFC 19/72] enic: Move the Cisco driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 20/72] pasemic_mac*: Move the PA Semi driver Jeff Kirsher
2011-06-26 1:34 ` Olof Johansson
2011-06-25 13:58 ` [RFC 21/72] tehuti: Move the Tehuti driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 22/72] stmmac: Move the STMicroelectronics driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Jeff Kirsher
2011-06-25 17:21 ` Marc Gauthier
2011-06-25 13:58 ` [RFC 25/72] smsc*/smc911x: Move the SMSC drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 26/72] arm: Move the ARM/ACORN drivers Jeff Kirsher
2011-06-25 14:48 ` Arnd Bergmann
2011-06-25 14:50 ` Arnd Bergmann
2011-06-25 15:53 ` Russell King - ARM Linux
2011-06-25 16:03 ` Arnd Bergmann
2011-06-25 16:12 ` Russell King - ARM Linux
2011-06-25 16:59 ` Arnd Bergmann
2011-06-25 18:02 ` Jeff Kirsher
2011-06-25 18:06 ` Jeff Kirsher
2011-06-25 18:22 ` Arnd Bergmann
2011-06-26 6:38 ` Joe Perches
2011-06-27 3:10 ` Gole, Anant
2011-06-25 13:58 ` [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers Jeff Kirsher
2011-06-27 1:51 ` Po-Yu Chuang
2011-06-25 13:58 ` [RFC 28/72] 8139*/atp/r8169: Move the Realtek drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 29/72] de6*/dl2k: Move the D-Link drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 30/72] atl*: Move the Atheros drivers Jeff Kirsher
2011-06-25 18:16 ` Chris Snook
2011-06-25 13:58 ` [RFC 31/72] tulip: Move the tulip drivers Jeff Kirsher
2011-07-03 0:04 ` Grant Grundler
2011-06-25 13:58 ` [RFC 32/72] ioc3-eth/meth/sgiseeq: Move the SGI drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 33/72] pch_gbe: Move the OKI driver Jeff Kirsher
2011-06-27 1:53 ` Toshiharu Okada
2011-06-25 13:58 ` [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers Jeff Kirsher
2011-06-25 14:49 ` Arnd Bergmann
2011-06-25 16:26 ` Stephen Hemminger
2011-06-25 13:58 ` [RFC 35/72] via-*: Move the VIA drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 36/72] eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers Jeff Kirsher
2011-06-29 15:39 ` Tabi Timur-B04825
2011-07-09 15:07 ` Jeff Kirsher
2011-06-25 13:58 ` [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 39/72] mv643xx/pxa168: Move the Marvell drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 40/72] spider_net: Move the spider_net (IBM) driver Jeff Kirsher
2011-06-25 14:34 ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 42/72] 82586.c/fec*: Move the Motorola drivers Jeff Kirsher
2011-06-25 16:53 ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers Jeff Kirsher
2011-06-28 20:33 ` Geert Uytterhoeven
2011-07-09 14:30 ` Jeff Kirsher
2011-07-10 19:34 ` Geert Uytterhoeven
2011-07-11 0:48 ` Jeff Kirsher
2011-07-11 6:33 ` Geert Uytterhoeven
2011-07-11 9:39 ` Jeff Kirsher
2011-07-11 9:51 ` Geert Uytterhoeven
2011-07-11 11:31 ` Christoph Hellwig
2011-07-11 11:41 ` David Miller
2011-07-10 19:56 ` Christoph Hellwig
2011-06-25 13:58 ` [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 45/72] tlan/cpmac: Move the TI drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 46/72] ixp2000: Move the Radisys driver Jeff Kirsher
2011-06-26 11:47 ` Lennert Buytenhek
2011-07-09 15:58 ` Jeff Kirsher
2011-07-15 0:08 ` Lennert Buytenhek
2011-07-15 1:19 ` Jeff Kirsher
2011-07-15 10:32 ` Lennert Buytenhek
2011-06-25 13:58 ` [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 48/72] octeon: Move the Cavium driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 49/72] jme: Move the JME driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers Jeff Kirsher
2011-06-25 13:59 ` [RFC 51/72] ipg: Move the IC Plus driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
2011-06-25 14:54 ` Arnd Bergmann
2011-06-25 16:25 ` Geoff Levand
2011-06-25 13:59 ` [RFC 53/72] korina: Move the IDT driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers Jeff Kirsher
2011-06-25 16:13 ` Ralf Baechle
2011-06-25 18:11 ` Jeff Kirsher
2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
2011-06-25 14:57 ` Arnd Bergmann
2011-06-27 18:41 ` Hennerich, Michael
2011-06-25 13:59 ` [RFC 56/72] macb: Move the Atmel driver Jeff Kirsher
2011-06-27 7:46 ` Nicolas Ferre
2011-06-27 9:29 ` Jamie Iles
2011-06-25 13:59 ` [RFC 57/72] sc92031: Move the Silan driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 58/72] sundance: Move the sundance driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 59/72] r6040: Move the RDC driver Jeff Kirsher
2011-06-25 18:59 ` Florian Fainelli
2011-06-25 13:59 ` [RFC 60/72] fealnx: Move the Myson driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 61/72] forcedeth: Move the NVIDIA nForce driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 62/72] starfire: Move the starfire driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 63/72] hp100/depca: Move the HP and Digital drivers Jeff Kirsher
2011-06-25 13:59 ` [RFC 64/72] at1700: Move the Allied Telesis driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 65/72] dnet: Move the Dave Ethernet driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 66/72] ethoc: Move the Avionic driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 67/72] greth: Move the Aeroflex Gaisler driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 68/72] enc28j60: Move the enc28j60 driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 69/72] dm9000: Move the Davicom driver Jeff Kirsher
2011-06-27 9:45 ` Sascha Hauer
2011-06-25 13:59 ` [RFC 70/72] netx: Move the netx driver Jeff Kirsher
2011-06-27 9:45 ` Sascha Hauer
2011-06-25 13:59 ` [RFC 71/72] sh_eth: Move the Renesas SuperH driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 72/72] drivers/net: Kconfig and Makefile cleanup Jeff Kirsher
2011-06-26 7:54 ` [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Bill Fink
2011-06-26 8:35 ` Francois Romieu
2011-06-27 5:35 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309010363-22750-5-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=alain.malek@cryogen.com \
--cc=becker@scyld.com \
--cc=dahinds@users.sourceforge.net \
--cc=davem@davemloft.net \
--cc=dhd@debian.org \
--cc=netdev@vger.kernel.org \
--cc=p2@mind.be \
--cc=paul.gortmaker@windriver.com \
--cc=wimpie@kotnet.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).