From be3112a96072d96361629e5dd6e15fe8c4922871 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 15 Jun 2011 10:17:58 -0700
Subject: [PATCH] --- yaml --- r: 265264 b: refs/heads/master c:
 63d24a0eb71b1ec5ed302816379aaf76eecb053c h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/MAINTAINERS                      |  2 +-
 trunk/drivers/net/Kconfig              | 12 ------------
 trunk/drivers/net/Makefile             |  1 -
 trunk/drivers/net/ethernet/Kconfig     | 13 +++++++++++++
 trunk/drivers/net/ethernet/Makefile    |  1 +
 trunk/drivers/net/{ => ethernet}/jme.c |  0
 trunk/drivers/net/{ => ethernet}/jme.h |  0
 8 files changed, 16 insertions(+), 15 deletions(-)
 rename trunk/drivers/net/{ => ethernet}/jme.c (100%)
 rename trunk/drivers/net/{ => ethernet}/jme.h (100%)

diff --git a/[refs] b/[refs]
index 71a676429c3e..f4a44fbdc265 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c23c5c1663b36c1428df32d1645232662459e02f
+refs/heads/master: 63d24a0eb71b1ec5ed302816379aaf76eecb053c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 622f4fc7968c..37cbe1495c6e 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3591,7 +3591,7 @@ JME NETWORK DRIVER
 M:	Guo-Fu Tseng <cooldavid@cooldavid.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/jme.*
+F:	drivers/net/ethernet/jme.*
 
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 M:	David Woodhouse <dwmw2@infradead.org>
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index b89662182825..996bae006fc3 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -547,18 +547,6 @@ config XILINX_LL_TEMAC
 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
 	  core used in Xilinx Spartan and Virtex FPGAs
 
-config JME
-	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
-	depends on PCI
-	select CRC32
-	select MII
-	---help---
-	  This driver supports the PCI-Express gigabit ethernet adapters
-	  based on JMicron JMC250 chipset.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called jme.
-
 endif # NETDEV_1000
 
 #
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 648fa5cac457..271fc52138de 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
 #
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index 70c60ef7ac74..c29c1457aa9a 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/drivers/net/ethernet/Kconfig
@@ -31,6 +31,19 @@ source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/xscale/Kconfig"
+
+config JME
+	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the PCI-Express gigabit ethernet adapters
+	  based on JMicron JMC250 chipset.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called jme.
+
 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 929ee29007cc..8495c507725c 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/drivers/net/ethernet/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
+obj-$(CONFIG_JME) += jme.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/jme.c b/trunk/drivers/net/ethernet/jme.c
similarity index 100%
rename from trunk/drivers/net/jme.c
rename to trunk/drivers/net/ethernet/jme.c
diff --git a/trunk/drivers/net/jme.h b/trunk/drivers/net/ethernet/jme.h
similarity index 100%
rename from trunk/drivers/net/jme.h
rename to trunk/drivers/net/ethernet/jme.h