Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+11 -10
-9
drivers/net/Kconfig
··· 370 370 To compile this driver as a module, choose M here. The module 371 371 will be called forcedeth. 372 372 373 - config FEALNX 374 - tristate "Myson MTD-8xx PCI Ethernet support" 375 - depends on NET_PCI && PCI 376 - select CRC32 377 - select MII 378 - help 379 - Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 380 - cards. <http://www.myson.com.tw/> 381 - 382 373 config NET_POCKET 383 374 bool "Pocket and portable adapters" 384 375 depends on PARPORT
-1
drivers/net/Makefile
··· 16 16 17 17 obj-$(CONFIG_ROADRUNNER) += rrunner.o 18 18 19 - obj-$(CONFIG_FEALNX) += fealnx.o 20 19 obj-$(CONFIG_SKFP) += skfp/ 21 20 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o 22 21 obj-$(CONFIG_RIONET) += rionet.o
+10
drivers/net/ethernet/Kconfig
··· 73 73 If you are not using a MIPSsim or are unsure, say N. 74 74 75 75 source "drivers/net/ethernet/myricom/Kconfig" 76 + 77 + config FEALNX 78 + tristate "Myson MTD-8xx PCI Ethernet support" 79 + depends on PCI 80 + select CRC32 81 + select MII 82 + ---help--- 83 + Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 84 + cards. <http://www.myson.com.tw/> 85 + 76 86 source "drivers/net/ethernet/natsemi/Kconfig" 77 87 source "drivers/net/ethernet/8390/Kconfig" 78 88 source "drivers/net/ethernet/nuvoton/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 34 34 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ 35 35 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o 36 36 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ 37 + obj-$(CONFIG_FEALNX) += fealnx.o 37 38 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ 38 39 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ 39 40 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
drivers/net/fealnx.c drivers/net/ethernet/fealnx.c