From 6e5a98d55e7b5654923c5278d6672750133eeb73 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 17 Jun 2011 21:45:53 -0700
Subject: [PATCH] --- yaml --- r: 265267 b: refs/heads/master c:
 19c72cacce0ed8def4a37a5b4c4408cc83cf949c h: refs/heads/master i:   265265:
 366e09ae8f25bb5deb6cb068f8a2a3e214cc7e26   265263:
 f89a4b17e898c56182ef7b90c1cc947ef4743de3 v: v3

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

diff --git a/[refs] b/[refs]
index f226cb3babeb..3f061731876f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7443713a31f284365454493a9adbaea02bcc4344
+refs/heads/master: 19c72cacce0ed8def4a37a5b4c4408cc83cf949c
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index bcf7368decd9..d9b3cb5aad33 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -237,13 +237,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config KORINA
-	tristate "Korina (IDT RC32434) Ethernet support"
-	depends on NET_ETHERNET && MIKROTIK_RB532
-	help
-	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
-	  based system say Y. Otherwise say N.
-
 config MIPS_SIM_NET
 	tristate "MIPS simulator Network device"
 	depends on MIPS_SIM
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 2fb039b963fb..6c17cb6c35a7 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index 72d0f5ef23c7..dae10a3eca78 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/drivers/net/ethernet/Kconfig
@@ -45,6 +45,13 @@ config JME
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
+config KORINA
+	tristate "Korina (IDT RC32434) Ethernet support"
+	depends on MIKROTIK_RB532
+	---help---
+	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
+	  based system say Y. Otherwise say N.
+
 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 a8d8913b3055..ddf097df9238 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/drivers/net/ethernet/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
 obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
+obj-$(CONFIG_KORINA) += korina.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/korina.c b/trunk/drivers/net/ethernet/korina.c
similarity index 100%
rename from trunk/drivers/net/korina.c
rename to trunk/drivers/net/ethernet/korina.c