From c22e479978b4002de338aa9ac18c40d5a0f9d01c Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 22 Jul 2011 17:36:06 -0700
Subject: [PATCH] --- yaml --- r: 265269 b: refs/heads/master c:
 ae7668d03c4de78dd0be79278f410a1415786e67 h: refs/heads/master i:   265267:
 6e5a98d55e7b5654923c5278d6672750133eeb73 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/Kconfig                      | 6 ------
 trunk/drivers/net/Makefile                     | 1 -
 trunk/drivers/net/ethernet/Kconfig             | 6 ++++++
 trunk/drivers/net/ethernet/Makefile            | 1 +
 trunk/drivers/net/{ => ethernet}/lantiq_etop.c | 0
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/drivers/net/{ => ethernet}/lantiq_etop.c (100%)

diff --git a/[refs] b/[refs]
index ea14c9ded62c..66da0d954555 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3215df6a8e35fe6fc7c86ee0df2863c669a8e068
+refs/heads/master: ae7668d03c4de78dd0be79278f410a1415786e67
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index d38cad2c6b7c..fd333803be8c 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/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/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 389c268bc8b9..8e6dbd741206 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/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/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index f1509a598102..6b3b3dc172e7 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/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/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
index 50fc50a49295..2a1cbce02789 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/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/trunk/drivers/net/lantiq_etop.c b/trunk/drivers/net/ethernet/lantiq_etop.c
similarity index 100%
rename from trunk/drivers/net/lantiq_etop.c
rename to trunk/drivers/net/ethernet/lantiq_etop.c