diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-22 17:36:06 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 12:38:08 -0700 |
| commit | ae7668d03c4de78dd0be79278f410a1415786e67 (patch) | |
| tree | a740f183d7ed8601a5cc090afc0e092e02a8b1ad | |
| parent | 3215df6a8e35fe6fc7c86ee0df2863c669a8e068 (diff) | |
| download | linux-ae7668d03c4de78dd0be79278f410a1415786e67.tar.gz linux-ae7668d03c4de78dd0be79278f410a1415786e67.tar.bz2 linux-ae7668d03c4de78dd0be79278f410a1415786e67.zip | |
lantiq: Move the Lantiq SoC driver
Move the Lantiq driver into drivers/net/ethernet/ and the
necessary Kconfig and Makefile changes.
CC: John Crispin <blogic@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: John Crispin <blogic@openwrt.org>
| -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 the questions about this class of network devices. If you say Y, you will be asked for your specific device in the following questions. -config LANTIQ_ETOP - tristate "Lantiq SoC ETOP driver" - depends on SOC_TYPE_XWAY - help - Support for the MII0 inside the Lantiq SoC - endif # NET_ETHERNET # 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 obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o -obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o obj-$(CONFIG_DNET) += dnet.o 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 If you have a Mikrotik RouterBoard 500 or IDT RC32434 based system say Y. Otherwise say N. +config LANTIQ_ETOP + tristate "Lantiq SoC ETOP driver" + depends on SOC_TYPE_XWAY + ---help--- + Support for the MII0 inside the Lantiq SoC + source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" 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/ obj-$(CONFIG_IP1000) += icplus/ obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_KORINA) += korina.o +obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ 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 |