From b0262b682c827512012b4db8ac844b98a622aeaa Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 18 Jun 2011 03:26:31 -0700
Subject: [PATCH] --- yaml --- r: 265273 b: refs/heads/master c:
 15c037d6423eefb0fc2763f875dbacb71109d603 h: refs/heads/master i:   265271:
 3e441d3a268bce84571e6f73f1077d1d699dd47f v: v3

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

diff --git a/[refs] b/[refs]
index 7fad3dc553ae..d04481a3a937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58565a35eab01eb5fba928af23d31a636d03a056
+refs/heads/master: 15c037d6423eefb0fc2763f875dbacb71109d603
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index ca3afb530eec..754ddd298f3a 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -370,15 +370,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 
-config FEALNX
-	tristate "Myson MTD-8xx PCI Ethernet support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
-	  cards. <http://www.myson.com.tw/>
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 051439fc433a..e11166a6b7c9 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index 78e567ff5a74..711297f33087 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/drivers/net/ethernet/Kconfig
@@ -73,6 +73,16 @@ config MIPS_SIM_NET
 	  If you are not using a MIPSsim or are unsure, say N.
 
 source "drivers/net/ethernet/myricom/Kconfig"
+
+config FEALNX
+	tristate "Myson MTD-8xx PCI Ethernet support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
+	  cards. <http://www.myson.com.tw/>
+
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"
diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
index 48d32095f9af..e30dde4390db 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/drivers/net/ethernet/Makefile
@@ -34,6 +34,7 @@ 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_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
diff --git a/trunk/drivers/net/fealnx.c b/trunk/drivers/net/ethernet/fealnx.c
similarity index 100%
rename from trunk/drivers/net/fealnx.c
rename to trunk/drivers/net/ethernet/fealnx.c