mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
d7058a79c5
commit
7191047028
5 changed files with 12 additions and 11 deletions
|
@ -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
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
|
Loading…
Reference in a new issue