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

Commit 58565a35 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9f2f381f

MAINTAINERS

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

drivers/net/Kconfig

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

drivers/net/Makefile

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

drivers/net/ethernet/Kconfig

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

drivers/net/ethernet/Makefile

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