diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-19 01:15:12 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 12:38:01 -0700 |
| commit | 3215df6a8e35fe6fc7c86ee0df2863c669a8e068 (patch) | |
| tree | dca18e0d61b12fcda96b480572e41d2c1ea9431c /drivers | |
| parent | 19c72cacce0ed8def4a37a5b4c4408cc83cf949c (diff) | |
mipsnet: Move the MIPS driver
Move the MIPS drivers into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/mipsnet.c (renamed from drivers/net/mipsnet.c) | 0 |
5 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d9b3cb5aad3..d38cad2c6b7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -237,14 +237,6 @@ config MACB source "drivers/net/arm/Kconfig" -config MIPS_SIM_NET - tristate "MIPS simulator Network device" - depends on MIPS_SIM - help - The MIPSNET device is a simple Ethernet network device which is - emulated by the MIPS Simulator. - If you are not using a MIPSsim or are unsure, say N. - config SH_ETH tristate "Renesas SuperH Ethernet support" depends on SUPERH && \ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6c17cb6c35a..389c268bc8b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVTAP) += macvtap.o obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_EQUALIZER) += eql.o -obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index dae10a3eca7..f1509a59810 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -55,6 +55,15 @@ config KORINA source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/micrel/Kconfig" + +config MIPS_SIM_NET + tristate "MIPS simulator Network device" + depends on MIPS_SIM + ---help--- + The MIPSNET device is a simple Ethernet network device which is + emulated by the MIPS Simulator. + If you are not using a MIPSsim or are unsure, say N. + source "drivers/net/ethernet/myricom/Kconfig" source "drivers/net/ethernet/natsemi/Kconfig" source "drivers/net/ethernet/8390/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index ddf097df923..50fc50a4929 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_KORINA) += korina.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ +obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ diff --git a/drivers/net/mipsnet.c b/drivers/net/ethernet/mipsnet.c index 004e64ab1f9..004e64ab1f9 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/ethernet/mipsnet.c |