Commit 59ffb30f authored by Jeff Kirsher's avatar Jeff Kirsher

xircom: Move the Xircom driver

Move the Xircom driver into drivers/net/ethernet/xircom/ and
make the necessary Kconfig and Makefile changes.

CC: <psheer@icon.co.za>
CC: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 37b93757
...@@ -160,5 +160,6 @@ source "drivers/net/ethernet/toshiba/Kconfig" ...@@ -160,5 +160,6 @@ source "drivers/net/ethernet/toshiba/Kconfig"
source "drivers/net/ethernet/tundra/Kconfig" source "drivers/net/ethernet/tundra/Kconfig"
source "drivers/net/ethernet/via/Kconfig" source "drivers/net/ethernet/via/Kconfig"
source "drivers/net/ethernet/xilinx/Kconfig" source "drivers/net/ethernet/xilinx/Kconfig"
source "drivers/net/ethernet/xircom/Kconfig"
endif # ETHERNET endif # ETHERNET
...@@ -69,3 +69,4 @@ obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ ...@@ -69,3 +69,4 @@ obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/ obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
obj-$(CONFIG_NET_VENDOR_VIA) += via/ obj-$(CONFIG_NET_VENDOR_VIA) += via/
obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/ obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/
#
# Xircom network device configuration
#
config NET_VENDOR_XIRCOM
bool "Xircom devices"
depends on PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about Xircom cards. If you say Y, you will be asked for
your specific card in the following questions.
if NET_VENDOR_XIRCOM
config PCMCIA_XIRC2PS
tristate "Xircom 16-bit PCMCIA support"
depends on PCMCIA
---help---
Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card)
Ethernet or Fast Ethernet card to your computer.
To compile this driver as a module, choose M here: the module will be
called xirc2ps_cs. If unsure, say N.
endif # NET_VENDOR_XIRCOM
#
# Makefile for the Xircom network device drivers.
#
obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o
...@@ -21,15 +21,6 @@ menuconfig NET_PCMCIA ...@@ -21,15 +21,6 @@ menuconfig NET_PCMCIA
if NET_PCMCIA && PCMCIA if NET_PCMCIA && PCMCIA
config PCMCIA_XIRC2PS
tristate "Xircom 16-bit PCMCIA support"
help
Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card)
Ethernet or Fast Ethernet card to your computer.
To compile this driver as a module, choose M here: the module will be
called xirc2ps_cs. If unsure, say N.
config ARCNET_COM20020_CS config ARCNET_COM20020_CS
tristate "COM20020 ARCnet PCMCIA support" tristate "COM20020 ARCnet PCMCIA support"
depends on ARCNET_COM20020 depends on ARCNET_COM20020
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# #
# 16-bit client drivers # 16-bit client drivers
obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
Markdown is supported
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