diff options
| -rw-r--r-- | drivers/net/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/fealnx.c (renamed from drivers/net/fealnx.c) | 0 |
5 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ca3afb530eec..754ddd298f3a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -370,15 +370,6 @@ config FORCEDETH | |||
| 370 | To compile this driver as a module, choose M here. The module | 370 | To compile this driver as a module, choose M here. The module |
| 371 | will be called forcedeth. | 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 | config NET_POCKET | 373 | config NET_POCKET |
| 383 | bool "Pocket and portable adapters" | 374 | bool "Pocket and portable adapters" |
| 384 | depends on PARPORT | 375 | depends on PARPORT |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 051439fc433a..e11166a6b7c9 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o | |||
| 16 | 16 | ||
| 17 | obj-$(CONFIG_ROADRUNNER) += rrunner.o | 17 | obj-$(CONFIG_ROADRUNNER) += rrunner.o |
| 18 | 18 | ||
| 19 | obj-$(CONFIG_FEALNX) += fealnx.o | ||
| 20 | obj-$(CONFIG_SKFP) += skfp/ | 19 | obj-$(CONFIG_SKFP) += skfp/ |
| 21 | obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o | 20 | obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o |
| 22 | obj-$(CONFIG_RIONET) += rionet.o | 21 | obj-$(CONFIG_RIONET) += rionet.o |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 78e567ff5a74..711297f33087 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
| @@ -73,6 +73,16 @@ config MIPS_SIM_NET | |||
| 73 | If you are not using a MIPSsim or are unsure, say N. | 73 | If you are not using a MIPSsim or are unsure, say N. |
| 74 | 74 | ||
| 75 | source "drivers/net/ethernet/myricom/Kconfig" | 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 | source "drivers/net/ethernet/natsemi/Kconfig" | 86 | source "drivers/net/ethernet/natsemi/Kconfig" |
| 77 | source "drivers/net/ethernet/8390/Kconfig" | 87 | source "drivers/net/ethernet/8390/Kconfig" |
| 78 | source "drivers/net/ethernet/nuvoton/Kconfig" | 88 | source "drivers/net/ethernet/nuvoton/Kconfig" |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 48d32095f9af..e30dde4390db 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
| @@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ | |||
| 34 | obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ | 34 | obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ |
| 35 | obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o | 35 | obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o |
| 36 | obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ | 36 | obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ |
| 37 | obj-$(CONFIG_FEALNX) += fealnx.o | ||
| 37 | obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ | 38 | obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ |
| 38 | obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ | 39 | obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ |
| 39 | obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ | 40 | obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ |
diff --git a/drivers/net/fealnx.c b/drivers/net/ethernet/fealnx.c index fa8677c32384..fa8677c32384 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/ethernet/fealnx.c | |||
