dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

r6040: Move the RDC driver 

Move the RDC driver into drivers/net/ethernet/rdc/ and make the
necessary Kconfig and Makefile changes.

CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jeff Kirsher 2011-07-23 23:26:01 -07:00
parent 9f2f381f81
commit 58565a35ea
8 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -5343,7 +5343,7 @@ RDC R6040 FAST ETHERNET DRIVER
M: Florian Fainelli <florian@openwrt.org>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/r6040.c
F: drivers/net/ethernet/rdc/r6040.c
RDS - RELIABLE DATAGRAM SOCKETS
M: Andy Grover <andy.grover@oracle.com>

13
drivers/net/Kconfig
View File

@ -379,19 +379,6 @@ config FEALNX
Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
cards. <http://www.myson.com.tw/>
config R6040
tristate "RDC R6040 Fast Ethernet Adapter support"
depends on NET_PCI && PCI
select CRC32
select MII
select PHYLIB
help
This is a driver for the R6040 Fast Ethernet MACs found in the
the RDC R-321x System-on-chips.
To compile this driver as a module, choose M here: the module
will be called r6040. This is recommended.
config NET_POCKET
bool "Pocket and portable adapters"
depends on PARPORT

1
drivers/net/Makefile
View File

@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

1
drivers/net/ethernet/Kconfig
View File

@ -83,6 +83,7 @@ source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig"
config S6GMAC
tristate "S6105 GMAC ethernet support"

1
drivers/net/ethernet/Makefile
View File

@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
obj-$(CONFIG_NET_VENDOR_SIS) += sis/

33
drivers/net/ethernet/rdc/Kconfig Normal file
View File

@ -0,0 +1,33 @@
#
# RDC network device configuration
#
config NET_VENDOR_RDC
bool "RDC devices"
depends on PCI
---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 RDC cards. If you say Y, you will be asked for
your specific card in the following questions.
if NET_VENDOR_RDC
config R6040
tristate "RDC R6040 Fast Ethernet Adapter support"
depends on PCI
select CRC32
select MII
select PHYLIB
---help---
This is a driver for the R6040 Fast Ethernet MACs found in the
the RDC R-321x System-on-chips.
To compile this driver as a module, choose M here: the module
will be called r6040. This is recommended.
endif # NET_VENDOR_RDC

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

@ -0,0 +1,5 @@
#
# Makefile for the RDC network device drivers.
#
obj-$(CONFIG_R6040) += r6040.o

0
drivers/net/r6040.c → drivers/net/ethernet/rdc/r6040.c
View File