From f89a4b17e898c56182ef7b90c1cc947ef4743de3 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 15 Jun 2011 09:51:27 -0700
Subject: [PATCH] --- yaml --- r: 265263 b: refs/heads/master c:
 c23c5c1663b36c1428df32d1645232662459e02f h: refs/heads/master i:   265261:
 9936ecf3ddd34340e5021e99a3adf4ff63c88052   265259:
 97fef6edfb55f75ba4f2caf4081b19738a7923b5   265255:
 3d92a07647f4df62df1bb77005d80c5ced06c8c1   265247:
 656137b0858ff62519e2b76912e049c979e56a64 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/Kconfig                             | 2 --
 trunk/drivers/net/Makefile                            | 1 -
 trunk/drivers/net/ethernet/Kconfig                    | 1 +
 trunk/drivers/net/ethernet/Makefile                   | 1 +
 trunk/drivers/net/{ => ethernet}/octeon/Kconfig       | 6 +++++-
 trunk/drivers/net/ethernet/octeon/Makefile            | 5 +++++
 trunk/drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 0
 trunk/drivers/net/octeon/Makefile                     | 2 --
 9 files changed, 13 insertions(+), 7 deletions(-)
 rename trunk/drivers/net/{ => ethernet}/octeon/Kconfig (85%)
 create mode 100644 trunk/drivers/net/ethernet/octeon/Makefile
 rename trunk/drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
 delete mode 100644 trunk/drivers/net/octeon/Makefile

diff --git a/[refs] b/[refs]
index 8f321fd873ed..71a676429c3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554f4ffd3b2cd88e42007d069bc519563d0b459f
+refs/heads/master: c23c5c1663b36c1428df32d1645232662459e02f
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 99b209e0b78f..b89662182825 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -506,8 +506,6 @@ config LANTIQ_ETOP
 	help
 	  Support for the MII0 inside the Lantiq SoC
 
-source "drivers/net/octeon/Kconfig"
-
 endif # NET_ETHERNET
 
 #
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index d8c286effbba..648fa5cac457 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -105,5 +105,4 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_WIMAX) += wimax/
 obj-$(CONFIG_CAIF) += caif/
 
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_TILE_NET) += tile/
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
index 140dd73420d6..70c60ef7ac74 100644
--- a/trunk/drivers/net/ethernet/Kconfig
+++ b/trunk/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/nuvoton/Kconfig"
+source "drivers/net/ethernet/octeon/Kconfig"
 source "drivers/net/ethernet/oki-semi/Kconfig"
 source "drivers/net/ethernet/packetengines/Kconfig"
 source "drivers/net/ethernet/pasemi/Kconfig"
diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
index 8a97b193f6ef..929ee29007cc 100644
--- a/trunk/drivers/net/ethernet/Makefile
+++ b/trunk/drivers/net/ethernet/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
 obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
diff --git a/trunk/drivers/net/octeon/Kconfig b/trunk/drivers/net/ethernet/octeon/Kconfig
similarity index 85%
rename from trunk/drivers/net/octeon/Kconfig
rename to trunk/drivers/net/ethernet/octeon/Kconfig
index 1e56bbf3f5c0..3de52ffd2872 100644
--- a/trunk/drivers/net/octeon/Kconfig
+++ b/trunk/drivers/net/ethernet/octeon/Kconfig
@@ -1,10 +1,14 @@
+#
+# Cavium network device configuration
+#
+
 config OCTEON_MGMT_ETHERNET
 	tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"
 	depends on  CPU_CAVIUM_OCTEON
 	select PHYLIB
 	select MDIO_OCTEON
 	default y
-	help
+	---help---
 	  This option enables the ethernet driver for the management
 	  port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX,
 	  CN54XX, CN52XX, and CN6XXX chips.
diff --git a/trunk/drivers/net/ethernet/octeon/Makefile b/trunk/drivers/net/ethernet/octeon/Makefile
new file mode 100644
index 000000000000..efa41c1d91c5
--- /dev/null
+++ b/trunk/drivers/net/ethernet/octeon/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cavium network device drivers.
+#
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET)	+= octeon_mgmt.o
diff --git a/trunk/drivers/net/octeon/octeon_mgmt.c b/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c
similarity index 100%
rename from trunk/drivers/net/octeon/octeon_mgmt.c
rename to trunk/drivers/net/ethernet/octeon/octeon_mgmt.c
diff --git a/trunk/drivers/net/octeon/Makefile b/trunk/drivers/net/octeon/Makefile
deleted file mode 100644
index 906edecacfd3..000000000000
--- a/trunk/drivers/net/octeon/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET)	+= octeon_mgmt.o