From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH 09/15] netdev: relocate remaining ISA 3Com cards to legacy dir
Date: Thu, 28 Oct 2010 21:19:13 -0400 [thread overview]
Message-ID: <1288315159-1350-10-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1288315159-1350-1-git-send-email-paul.gortmaker@windriver.com>
The last mainstream motherboards produced with ISA slots were
some P3 Coppermine socket370 platforms with a single ISA slot
from around the turn of the century.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Kconfig | 26 --------------------------
drivers/net/Makefile | 2 --
drivers/net/{ => legacy}/3c509.c | 0
drivers/net/{ => legacy}/3c515.c | 0
drivers/net/legacy/Kconfig | 26 ++++++++++++++++++++++++++
drivers/net/legacy/Makefile | 4 ++++
6 files changed, 30 insertions(+), 28 deletions(-)
rename drivers/net/{ => legacy}/3c509.c (100%)
rename drivers/net/{ => legacy}/3c515.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9f6315c..5b6c3e9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -479,32 +479,6 @@ config NET_VENDOR_3COM
the questions about 3COM cards. If you say Y, you will be asked for
your specific card in the following questions.
-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 VORTEX
tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
depends on NET_VENDOR_3COM && (PCI || EISA)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e5015c6..790bb6c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -158,8 +158,6 @@ obj-$(CONFIG_SGISEEQ) += sgiseeq.o
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
obj-$(CONFIG_AT1700) += at1700.o
obj-$(CONFIG_IBMLANA) += ibmlana.o
-obj-$(CONFIG_EL3) += 3c509.o
-obj-$(CONFIG_3C515) += 3c515.o
obj-$(CONFIG_8139CP) += 8139cp.o
obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_CPMAC) += cpmac.o
diff --git a/drivers/net/3c509.c b/drivers/net/legacy/3c509.c
similarity index 100%
rename from drivers/net/3c509.c
rename to drivers/net/legacy/3c509.c
diff --git a/drivers/net/3c515.c b/drivers/net/legacy/3c515.c
similarity index 100%
rename from drivers/net/3c515.c
rename to drivers/net/legacy/3c515.c
diff --git a/drivers/net/legacy/Kconfig b/drivers/net/legacy/Kconfig
index 74644b8..c4cdc99 100644
--- a/drivers/net/legacy/Kconfig
+++ b/drivers/net/legacy/Kconfig
@@ -15,6 +15,32 @@ config EL1
To compile this driver as a module, choose M here. The module
will be called 3c501.
+config EL3
+ tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
+ depends on 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 DE600
tristate "D-Link DE600 pocket adapter support"
depends on NET_POCKET && PARPORT
diff --git a/drivers/net/legacy/Makefile b/drivers/net/legacy/Makefile
index eefacda..5341a1d 100644
--- a/drivers/net/legacy/Makefile
+++ b/drivers/net/legacy/Makefile
@@ -66,3 +66,7 @@ obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
obj-$(CONFIG_STNIC) += stnic.o 8390.o
obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
+
+# Other random one-off cards
+obj-$(CONFIG_EL3) += 3c509.o
+obj-$(CONFIG_3C515) += 3c515.o
--
1.7.3.2.146.g2d444
next prev parent reply other threads:[~2010-10-29 1:19 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 1:19 [PATCH 0/15] RFC: create drivers/net/legacy for ISA, EISA, MCA drivers Paul Gortmaker
2010-10-29 1:19 ` [PATCH 01/15] net: introduce legacy dir to absorb 10Mbit, ISA, EISA drivers Paul Gortmaker
2010-10-29 1:19 ` [PATCH 02/15] 3c501: relocate ancient 8 bit ISA driver to legacy dir Paul Gortmaker
2010-10-29 1:19 ` [PATCH 03/15] de6xx: relocate ancient parallel port eth drivers to legacy Paul Gortmaker
2010-10-29 1:19 ` [PATCH 04/15] sun3: Relocate the sun3 specific lance/83596 " Paul Gortmaker
2010-10-29 1:19 ` [PATCH 05/15] dec netdev: relocate DIGITAL based " Paul Gortmaker
2010-10-29 4:21 ` Maciej W. Rozycki
2010-10-29 4:29 ` David Miller
2010-10-29 4:54 ` Maciej W. Rozycki
2010-10-29 5:46 ` Maciej W. Rozycki
2010-10-29 5:53 ` David Miller
2010-10-29 5:47 ` David Miller
2010-10-29 5:50 ` Maciej W. Rozycki
2010-10-29 5:53 ` David Miller
2010-10-29 6:37 ` Maciej W. Rozycki
2010-10-29 1:19 ` [PATCH 06/15] netdev: relocate i8258x and i8259x " Paul Gortmaker
2010-10-29 1:19 ` [PATCH 07/15] lance: relocate legacy 7990 " Paul Gortmaker
2010-10-29 1:19 ` [PATCH 08/15] netdev: relocate toplevel 8390 based drivers to legacy dir Paul Gortmaker
2010-10-29 1:19 ` Paul Gortmaker [this message]
2010-10-29 1:19 ` [PATCH 10/15] netdev: relocate more one-off drivers to the " Paul Gortmaker
2010-10-29 1:19 ` [PATCH 11/15] netdev: kill off the concept of NET_VENDOR_FOO Paul Gortmaker
2010-10-29 1:19 ` [PATCH 12/15] netdev: relocate sb1000 ISA cable modem driver to legacy Paul Gortmaker
2010-10-29 1:19 ` [PATCH 13/15] netdev: kill off NET_ISA Kconfig option Paul Gortmaker
2010-10-29 1:19 ` [PATCH 14/15] MAINTAINERS: updates for new drivers/net/legacy dir Paul Gortmaker
2010-10-29 1:19 ` [PATCH 15/15] netdev: relocate LICENSE.SRC to legacy Paul Gortmaker
2010-10-29 1:48 ` [PATCH 0/15] RFC: create drivers/net/legacy for ISA, EISA, MCA drivers Joe Perches
2010-10-29 9:40 ` David Lamparter
2010-10-29 10:13 ` Maciej W. Rozycki
2010-10-29 21:26 ` Paul Gortmaker
2010-10-29 22:08 ` Joe Perches
2010-10-30 0:01 ` Jeff Kirsher
2010-11-04 21:20 ` Paul Gortmaker
2010-11-05 2:28 ` Jeff Kirsher
2010-11-05 12:51 ` Paul Gortmaker
2010-11-18 23:52 ` Joe Perches
2010-11-19 0:34 ` Jeff Kirsher
[not found] ` <alpine.LNX.2.01.1012161253560.3000@obet.zrqbmnf.qr>
2010-12-16 12:22 ` Jan Engelhardt
2010-12-17 9:51 ` 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=1288315159-1350-10-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.