Browse Source

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>
Jeff Kirsher 14 years ago
parent
commit
15c037d642

+ 0 - 9
drivers/net/Kconfig

@@ -370,15 +370,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 	  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
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	bool "Pocket and portable adapters"
 	depends on PARPORT
 	depends on PARPORT

+ 0 - 1
drivers/net/Makefile

@@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 
-obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_RIONET) += rionet.o

+ 10 - 0
drivers/net/ethernet/Kconfig

@@ -73,6 +73,16 @@ config MIPS_SIM_NET
 	  If you are not using a MIPSsim or are unsure, say N.
 	  If you are not using a MIPSsim or are unsure, say N.
 
 
 source "drivers/net/ethernet/myricom/Kconfig"
 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/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"

+ 1 - 0
drivers/net/ethernet/Makefile

@@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

+ 0 - 0
drivers/net/fealnx.c → drivers/net/ethernet/fealnx.c