aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/arcnet/Kconfig12
-rw-r--r--drivers/net/arcnet/Makefile1
-rw-r--r--drivers/net/arcnet/com20020_cs.c (renamed from drivers/net/pcmcia/com20020_cs.c)0
-rw-r--r--drivers/net/pcmcia/Kconfig34
-rw-r--r--drivers/net/pcmcia/Makefile6
7 files changed, 12 insertions, 44 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b3206c9222e6..5762370ed43c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -209,8 +209,6 @@ source "drivers/net/wimax/Kconfig"
209 209
210source "drivers/net/usb/Kconfig" 210source "drivers/net/usb/Kconfig"
211 211
212source "drivers/net/pcmcia/Kconfig"
213
214source "drivers/net/ppp/Kconfig" 212source "drivers/net/ppp/Kconfig"
215 213
216source "drivers/net/wan/Kconfig" 214source "drivers/net/wan/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e6a183efc71e..99327a4a3f7c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -51,7 +51,6 @@ obj-$(CONFIG_SLHC) += slip/
51obj-$(CONFIG_TR) += tokenring/ 51obj-$(CONFIG_TR) += tokenring/
52obj-$(CONFIG_WAN) += wan/ 52obj-$(CONFIG_WAN) += wan/
53obj-$(CONFIG_ARCNET) += arcnet/ 53obj-$(CONFIG_ARCNET) += arcnet/
54obj-$(CONFIG_NET_PCMCIA) += pcmcia/
55 54
56obj-$(CONFIG_USB_CATC) += usb/ 55obj-$(CONFIG_USB_CATC) += usb/
57obj-$(CONFIG_USB_KAWETH) += usb/ 56obj-$(CONFIG_USB_KAWETH) += usb/
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
index 3b2f7f115464..84fb6349a59a 100644
--- a/drivers/net/arcnet/Kconfig
+++ b/drivers/net/arcnet/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4 4
5menuconfig ARCNET 5menuconfig ARCNET
6 depends on NETDEVICES && (ISA || PCI) 6 depends on NETDEVICES && (ISA || PCI || PCMCIA)
7 tristate "ARCnet support" 7 tristate "ARCnet support"
8 ---help--- 8 ---help---
9 If you have a network card of this type, say Y and check out the 9 If you have a network card of this type, say Y and check out the
@@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
123 tristate "Support for COM20020 on PCI" 123 tristate "Support for COM20020 on PCI"
124 depends on ARCNET_COM20020 && PCI 124 depends on ARCNET_COM20020 && PCI
125 125
126config ARCNET_COM20020_CS
127 tristate "COM20020 ARCnet PCMCIA support"
128 depends on ARCNET_COM20020 && PCMCIA
129 help
130 Say Y here if you intend to attach this type of ARCnet PCMCIA card
131 to your computer.
132
133 To compile this driver as a module, choose M here: the module will be
134 called com20020_cs. If unsure, say N.
135
126endif # ARCNET 136endif # ARCNET
diff --git a/drivers/net/arcnet/Makefile b/drivers/net/arcnet/Makefile
index 5861af543d42..5ce8ee63e435 100644
--- a/drivers/net/arcnet/Makefile
+++ b/drivers/net/arcnet/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
12obj-$(CONFIG_ARCNET_COM20020) += com20020.o 12obj-$(CONFIG_ARCNET_COM20020) += com20020.o
13obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o 13obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
14obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o 14obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
15obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 980e65c14936..980e65c14936 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
deleted file mode 100644
index ff4deb0ace4d..000000000000
--- a/drivers/net/pcmcia/Kconfig
+++ /dev/null
@@ -1,34 +0,0 @@
1#
2# PCMCIA Network device configuration
3#
4
5menuconfig NET_PCMCIA
6 bool "PCMCIA network device support"
7 depends on PCMCIA
8 ---help---
9 Say Y if you would like to include support for any PCMCIA or CardBus
10 network adapters, then say Y to the driver for your particular card
11 below. PCMCIA- or PC-cards are credit-card size devices often used
12 with laptops computers; CardBus is the newer and faster version of
13 PCMCIA.
14
15 To use your PC-cards, you will need supporting software from David
16 Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
17 for location). You also want to check out the PCMCIA-HOWTO,
18 available from <http://www.tldp.org/docs.html#howto>.
19
20 If unsure, say N.
21
22if NET_PCMCIA && PCMCIA
23
24config ARCNET_COM20020_CS
25 tristate "COM20020 ARCnet PCMCIA support"
26 depends on ARCNET_COM20020
27 help
28 Say Y here if you intend to attach this type of ARCnet PCMCIA card
29 to your computer.
30
31 To compile this driver as a module, choose M here: the module will be
32 called com20020_cs. If unsure, say N.
33
34endif # NET_PCMCIA
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
deleted file mode 100644
index b98a0a4753fa..000000000000
--- a/drivers/net/pcmcia/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
1#
2# Makefile for the Linux PCMCIA network device drivers.
3#
4
5# 16-bit client drivers
6obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o