Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 18:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xircom: Move the Xircom driver

Browse Source 
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jeff Kirsher 2011-07-30 03:27:05 -07:00
parent 37b937575b
commit 59ffb30f7d
7 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/Kconfig
View File

@ -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

1
drivers/net/ethernet/Makefile
View File

@ -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/

30
drivers/net/ethernet/xircom/Kconfig Normal file
View File

@ -0,0 +1,30 @@
#
# 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

5
drivers/net/ethernet/xircom/Makefile Normal file
View File

@ -0,0 +1,5 @@
#
# Makefile for the Xircom network device drivers.
#
obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o

0
drivers/net/pcmcia/xirc2ps_cs.c → drivers/net/ethernet/xircom/xirc2ps_cs.c
View File

9
drivers/net/pcmcia/Kconfig
View File

@ -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

1
drivers/net/pcmcia/Makefile
View File

@ -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