---

yaml --- r: 265263 b: refs/heads/master c: c23c5c1 h: refs/heads/master i: 265261: 9936ecf 265259: 97fef6e 265255: 3d92a07 265247: 656137b v: v3
git-mirror · Aug 12, 2011 · f89a4b1 · f89a4b1
1 parent 566f4ad
commit f89a4b1
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → trunk/drivers/net/ethernet/octeon/Kconfig b/trunk/drivers/net/octeon/Kconfig → 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
@@ -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 → ...drivers/net/ethernet/octeon/octeon_mgmt.c b/trunk/drivers/net/octeon/octeon_mgmt.c → ...drivers/net/ethernet/octeon/octeon_mgmt.c
diff --git a/trunk/drivers/net/octeon/Makefile b/trunk/drivers/net/octeon/Makefile
-Original file line number
+Diff line change
@@ Expand Up / @@ -506,8 +506,6 @@ config LANTIQ_ETOP @@
     	help
     	  Support for the MII0 inside the Lantiq SoC
-    source "drivers/net/octeon/Kconfig"
     endif # NET_ETHERNET
     #
@@ Expand Down @@