diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-24 17:45:14 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 23:47:28 -0700 |
| commit | 7191047028471c74808291d35dd0502cf73e4d2a (patch) | |
| tree | a27ef2c31065af64715e56820ca07b6b33af1a3a /drivers/net | |
| parent | d7058a79c56abf58bb33a5c2eee2f7cde6f5ec36 (diff) | |
| download | linux-7191047028471c74808291d35dd0502cf73e4d2a.tar.gz linux-7191047028471c74808291d35dd0502cf73e4d2a.tar.bz2 linux-7191047028471c74808291d35dd0502cf73e4d2a.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/netx-eth.c (renamed from drivers/net/netx-eth.c) | 0 |
5 files changed, 12 insertions, 11 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 23155cc4a48f..572ddf226f12 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 298587f65c2b..8fa5b601c6b4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 45eef598cbb1..6e3619649f5f 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index dfd51467ea65..c274820ec29b 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/netx-eth.c b/drivers/net/ethernet/netx-eth.c index 2dfee892d200..2dfee892d200 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/ethernet/netx-eth.c |