From 330278cde612888e79fc4ab13d8f725258e903dd Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Mon, 22 Aug 2011 18:04:50 -0700 Subject: [PATCH] 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 Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 2 -- drivers/net/Makefile | 1 - drivers/net/arcnet/Kconfig | 12 ++++++- drivers/net/arcnet/Makefile | 1 + drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0 drivers/net/pcmcia/Kconfig | 34 -------------------- drivers/net/pcmcia/Makefile | 6 ---- 7 files changed, 12 insertions(+), 44 deletions(-) rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%) delete mode 100644 drivers/net/pcmcia/Kconfig delete mode 100644 drivers/net/pcmcia/Makefile 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" source "drivers/net/usb/Kconfig" -source "drivers/net/pcmcia/Kconfig" - source "drivers/net/ppp/Kconfig" source "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/ 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/ 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 @@ # 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 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 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 diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c similarity index 100% rename from drivers/net/pcmcia/com20020_cs.c rename to 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 @@ -# -# 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 - for location). You also want to check out the PCMCIA-HOWTO, - available from . - - 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 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 @@ -# -# Makefile for the Linux PCMCIA network device drivers. -# - -# 16-bit client drivers -obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o -- 2.34.1