Commit 71910470 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

netx: Move the netx driver 



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

CC: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent d7058a79

drivers/net/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -236,16 +236,6 @@ config SH_ETH 
	  This driver supporting CPUs are:

		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.



config NET_NETX

	tristate "NetX Ethernet support"

	select MII

	depends on ARCH_NETX

	help

	  This is support for the Hilscher netX builtin Ethernet ports



	  To compile this driver as a module, choose M here. The module

	  will be called netx-eth.



config NET_PCI

	bool "EISA, VLB, PCI and on board controllers"

	depends on ISA || EISA || PCI

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ obj-$(CONFIG_DEFXX) += defxx.o 
obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_NET_NETX) += netx-eth.o



obj-$(CONFIG_DEV_APPLETALK) += appletalk/

obj-$(CONFIG_ETHERNET) += ethernet/

drivers/net/ethernet/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -102,6 +102,17 @@ config FEALNX 


source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"



config NET_NETX

	tristate "NetX Ethernet support"

	select MII

	depends on ARCH_NETX

	---help---

	  This is support for the Hilscher netX builtin Ethernet ports



	  To compile this driver as a module, choose M here. The module

	  will be called netx-eth.



source "drivers/net/ethernet/nuvoton/Kconfig"

source "drivers/net/ethernet/nvidia/Kconfig"

source "drivers/net/ethernet/octeon/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o 
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/

obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/

obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

drivers/net/netx-eth.c→drivers/net/ethernet/netx-eth.c

+0 −0

File moved.

View file