---

yaml --- r: 177861 b: refs/heads/master c: d6aa60a h: refs/heads/master i: 177859: 5bd028e v: v3
git-mirror · Dec 17, 2009 · bf813f7 · bf813f7
1 parent 3c060cc
commit bf813f7
Show file tree

Hide file tree

Showing 6 changed files with 1,193 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7187a2ffcdedf6d8fd13c4a1250874071892347
+refs/heads/master: d6aa60a10b2f5068e331ca2936b1e6c248ae37c1
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1953,6 +1953,8 @@ config BCM63XX_ENET
 
 source "drivers/net/fs_enet/Kconfig"
 
+source "drivers/net/octeon/Kconfig"
+
 endif # NET_ETHERNET
 
 #

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -285,3 +285,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
 
 obj-$(CONFIG_WIMAX) += wimax/
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
diff --git a/trunk/drivers/net/octeon/Kconfig b/trunk/drivers/net/octeon/Kconfig
@@ -0,0 +1,10 @@
+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
+	  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/octeon/Makefile b/trunk/drivers/net/octeon/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET)	+= octeon_mgmt.o
-Original file line number
+Diff line change
@@ Expand Up / @@ -1953,6 +1953,8 @@ config BCM63XX_ENET @@
     source "drivers/net/fs_enet/Kconfig"
+    source "drivers/net/octeon/Kconfig"
     endif # NET_ETHERNET
     #
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -285,3 +285,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
		obj-$(CONFIG_SFC) += sfc/

		obj-$(CONFIG_WIMAX) += wimax/

		obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o