@@ -395,15 +395,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
@@ -17,7 +17,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
-obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
@@ -79,6 +79,16 @@ source "drivers/net/ethernet/micrel/Kconfig"
source "drivers/net/ethernet/mips/Kconfig"
source "drivers/net/ethernet/motorola/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/8390/Kconfig"
source "drivers/net/ethernet/octeon/Kconfig"
@@ -32,6 +32,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_MIPS) += mips/
obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_NET_ISA) += isa/
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> --- drivers/net/Kconfig | 9 --------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 10 ++++++++++ drivers/net/ethernet/Makefile | 1 + drivers/net/{ => ethernet}/fealnx.c | 0 5 files changed, 11 insertions(+), 10 deletions(-) rename drivers/net/{ => ethernet}/fealnx.c (100%) diff --git a/drivers/net/fealnx.c b/drivers/net/ethernet/fealnx.c similarity index 100% rename from drivers/net/fealnx.c rename to drivers/net/ethernet/fealnx.c