Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -160,5 +160,6 @@ source "drivers/net/ethernet/toshiba/Kconfig" 
source "drivers/net/ethernet/tundra/Kconfig"

source "drivers/net/ethernet/via/Kconfig"

source "drivers/net/ethernet/xilinx/Kconfig"

source "drivers/net/ethernet/xircom/Kconfig"



endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,3 +69,4 @@ obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ 
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/

obj-$(CONFIG_NET_VENDOR_VIA) += via/

obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/

obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/

drivers/net/ethernet/xircom/Kconfig

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# 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

drivers/net/ethernet/xircom/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#

# Makefile for the Xircom network device drivers.

#



obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o