diff options
-rw-r--r-- | drivers/net/Kconfig | 6 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/lantiq_etop.c (renamed from drivers/net/lantiq_etop.c) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d38cad2c6b7c..fd333803be8c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -478,12 +478,6 @@ config NET_POCKET | |||
478 | the questions about this class of network devices. If you say Y, you | 478 | the questions about this class of network devices. If you say Y, you |
479 | will be asked for your specific device in the following questions. | 479 | will be asked for your specific device in the following questions. |
480 | 480 | ||
481 | config LANTIQ_ETOP | ||
482 | tristate "Lantiq SoC ETOP driver" | ||
483 | depends on SOC_TYPE_XWAY | ||
484 | help | ||
485 | Support for the MII0 inside the Lantiq SoC | ||
486 | |||
487 | endif # NET_ETHERNET | 481 | endif # NET_ETHERNET |
488 | 482 | ||
489 | # | 483 | # |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 389c268bc8b9..8e6dbd741206 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -62,7 +62,6 @@ obj-$(CONFIG_DM9000) += dm9000.o | |||
62 | obj-$(CONFIG_ENC28J60) += enc28j60.o | 62 | obj-$(CONFIG_ENC28J60) += enc28j60.o |
63 | obj-$(CONFIG_ETHOC) += ethoc.o | 63 | obj-$(CONFIG_ETHOC) += ethoc.o |
64 | obj-$(CONFIG_GRETH) += greth.o | 64 | obj-$(CONFIG_GRETH) += greth.o |
65 | obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o | ||
66 | 65 | ||
67 | obj-$(CONFIG_DNET) += dnet.o | 66 | obj-$(CONFIG_DNET) += dnet.o |
68 | obj-$(CONFIG_MACB) += macb.o | 67 | obj-$(CONFIG_MACB) += macb.o |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index f1509a598102..6b3b3dc172e7 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -52,6 +52,12 @@ config KORINA | |||
52 | If you have a Mikrotik RouterBoard 500 or IDT RC32434 | 52 | If you have a Mikrotik RouterBoard 500 or IDT RC32434 |
53 | based system say Y. Otherwise say N. | 53 | based system say Y. Otherwise say N. |
54 | 54 | ||
55 | config LANTIQ_ETOP | ||
56 | tristate "Lantiq SoC ETOP driver" | ||
57 | depends on SOC_TYPE_XWAY | ||
58 | ---help--- | ||
59 | Support for the MII0 inside the Lantiq SoC | ||
60 | |||
55 | source "drivers/net/ethernet/marvell/Kconfig" | 61 | source "drivers/net/ethernet/marvell/Kconfig" |
56 | source "drivers/net/ethernet/mellanox/Kconfig" | 62 | source "drivers/net/ethernet/mellanox/Kconfig" |
57 | source "drivers/net/ethernet/micrel/Kconfig" | 63 | source "drivers/net/ethernet/micrel/Kconfig" |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 50fc50a49295..2a1cbce02789 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ | |||
26 | obj-$(CONFIG_IP1000) += icplus/ | 26 | obj-$(CONFIG_IP1000) += icplus/ |
27 | obj-$(CONFIG_JME) += jme.o | 27 | obj-$(CONFIG_JME) += jme.o |
28 | obj-$(CONFIG_KORINA) += korina.o | 28 | obj-$(CONFIG_KORINA) += korina.o |
29 | obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o | ||
29 | obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ | 30 | obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ |
30 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ | 31 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ |
31 | obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ | 32 | obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ |
diff --git a/drivers/net/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 45f252b7da30..45f252b7da30 100644 --- a/drivers/net/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c | |||