From a663fd11fddb93e02d36b0e77de0dbd9fd2498d8 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 19 Jul 2011 01:15:12 -0700
Subject: [PATCH] --- yaml --- r: 265268 b: refs/heads/master c:
 3215df6a8e35fe6fc7c86ee0df2863c669a8e068 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/Kconfig                  | 8 --------
 trunk/drivers/net/Makefile                 | 1 -
 trunk/drivers/net/ethernet/Kconfig         | 9 +++++++++
 trunk/drivers/net/ethernet/Makefile        | 1 +
 trunk/drivers/net/{ => ethernet}/mipsnet.c | 0
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename trunk/drivers/net/{ => ethernet}/mipsnet.c (100%)

diff --git a/[refs] b/[refs]
index 3f061731876f..ea14c9ded62c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19c72cacce0ed8def4a37a5b4c4408cc83cf949c
+refs/heads/master: 3215df6a8e35fe6fc7c86ee0df2863c669a8e068
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index d9b3cb5aad33..d38cad2c6b7c 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/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/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 6c17cb6c35a7..389c268bc8b9 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/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/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index dae10a3eca78..f1509a598102 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/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/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
index ddf097df9238..50fc50a49295 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/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/trunk/drivers/net/mipsnet.c b/trunk/drivers/net/ethernet/mipsnet.c
similarity index 100%
rename from trunk/drivers/net/mipsnet.c
rename to trunk/drivers/net/ethernet/mipsnet.c