From d3850d9cc9bfb950cafdb3db0fa793df68fab47c Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 13 Jun 2011 10:51:34 -0700
Subject: [PATCH] --- yaml --- r: 265260 b: refs/heads/master c:
 de69a4f240a1d43bc6a587c836c5ce1c66e36f23 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4afee591e166..82b7815a69e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e75ed60cbaf6a2b5f14f00d96d926110f983be6b
+refs/heads/master: de69a4f240a1d43bc6a587c836c5ce1c66e36f23
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index a96cf1871336..134c3a4ff423 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -643,17 +643,6 @@ config JME
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
-config S6GMAC
-	tristate "S6105 GMAC ethernet support"
-	depends on XTENSA_VARIANT_S6000
-	select PHYLIB
-	help
-	  This driver supports the on chip ethernet device on the
-	  S6105 xtensa processor.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called s6gmac.
-
 endif # NETDEV_1000
 
 #
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index d7ac2f8e031c..938484f8a467 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -83,7 +83,6 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
-obj-$(CONFIG_S6GMAC) += s6gmac.o
 
 obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index 8f404ea4f978..f53a4bc53ddb 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/drivers/net/ethernet/Kconfig
@@ -43,6 +43,18 @@ source "drivers/net/ethernet/pasemi/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
+
+config S6GMAC
+	tristate "S6105 GMAC ethernet support"
+	depends on XTENSA_VARIANT_S6000
+	select PHYLIB
+	---help---
+	  This driver supports the on chip ethernet device on the
+	  S6105 xtensa processor.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called s6gmac.
+
 source "drivers/net/ethernet/seeq/Kconfig"
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
index 6cf7f99fe3d8..4491d8491adb 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/drivers/net/ethernet/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/trunk/drivers/net/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c
similarity index 100%
rename from trunk/drivers/net/s6gmac.c
rename to trunk/drivers/net/ethernet/s6gmac.c