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

drivers/net/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/net/arcnet/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/arcnet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE