fealnx: Move the Myson driver

Move the Myson driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

5 files changed, 11 insertions, 10 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ca3afb530ee..754ddd298f3 100644
--- a/drivers/net/Kconfig
+++ b/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/drivers/net/Makefile b/drivers/net/Makefile
index 051439fc433..e11166a6b7c 100644
--- a/drivers/net/Makefile
+++ b/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/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 78e567ff5a7..711297f3308 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/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/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 48d32095f9a..e30dde4390d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/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/drivers/net/fealnx.c b/drivers/net/ethernet/fealnx.c
index fa8677c3238..fa8677c3238 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c