Commit 330278cd authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

com20020_cs: Move the PCMCIA Arcnet driver



Move the COM20020 PCMICA Arcnet driver into drivers/net/arcnet/ with
the other Arcnet drivers.  Made the necessary Kconfig and Makefile
changes as well.

Since this was the "last" PCMCIA driver in drivers/net/pcmcia/, this patch
also cleans up the references to drivers/net/pcmcia.

CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c0153225
......@@ -209,8 +209,6 @@ source "drivers/net/wimax/Kconfig"
source "drivers/net/usb/Kconfig"
source "drivers/net/pcmcia/Kconfig"
source "drivers/net/ppp/Kconfig"
source "drivers/net/wan/Kconfig"
......
......@@ -51,7 +51,6 @@ obj-$(CONFIG_SLHC) += slip/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
......
......@@ -3,7 +3,7 @@
#
menuconfig ARCNET
depends on NETDEVICES && (ISA || PCI)
depends on NETDEVICES && (ISA || PCI || PCMCIA)
tristate "ARCnet support"
---help---
If you have a network card of this type, say Y and check out the
......@@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
tristate "Support for COM20020 on PCI"
depends on ARCNET_COM20020 && PCI
config ARCNET_COM20020_CS
tristate "COM20020 ARCnet PCMCIA support"
depends on ARCNET_COM20020 && PCMCIA
help
Say Y here if you intend to attach this type of ARCnet PCMCIA card
to your computer.
To compile this driver as a module, choose M here: the module will be
called com20020_cs. If unsure, say N.
endif # ARCNET
......@@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
obj-$(CONFIG_ARCNET_COM20020) += com20020.o
obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o
#
# PCMCIA Network device configuration
#
menuconfig NET_PCMCIA
bool "PCMCIA network device support"
depends on PCMCIA
---help---
Say Y if you would like to include support for any PCMCIA or CardBus
network adapters, then say Y to the driver for your particular card
below. PCMCIA- or PC-cards are credit-card size devices often used
with laptops computers; CardBus is the newer and faster version of
PCMCIA.
To use your PC-cards, you will need supporting software from David
Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
for location). You also want to check out the PCMCIA-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
If unsure, say N.
if NET_PCMCIA && PCMCIA
config ARCNET_COM20020_CS
tristate "COM20020 ARCnet PCMCIA support"
depends on ARCNET_COM20020
help
Say Y here if you intend to attach this type of ARCnet PCMCIA card
to your computer.
To compile this driver as a module, choose M here: the module will be
called com20020_cs. If unsure, say N.
endif # NET_PCMCIA
#
# Makefile for the Linux PCMCIA network device drivers.
#
# 16-bit client drivers
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment