---

yaml --- r: 136058 b: refs/heads/master c: a170285 h: refs/heads/master v: v3
git-mirror · Mar 27, 2009 · 69a90e2 · 69a90e2
1 parent 5bc61f4
commit 69a90e2
Show file tree

Hide file tree

Showing 5 changed files with 1,144 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e6de64d9c8d0e75dca3bb4cf898db73abe00d4
+refs/heads/master: a1702857724fb39cb68ce581490010df99168fd0
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -972,6 +972,14 @@ config ENC28J60_WRITEVERIFY
 	  Enable the verify after the buffer write useful for debugging purpose.
 	  If unsure, say N.
 
+config ETHOC
+	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+	depends on NET_ETHERNET
+	select MII
+	select PHYLIB
+	help
+	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+
 config SMC911X
 	tristate "SMSC LAN911[5678] support"
 	select CRC32

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -230,6 +230,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
 pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_MLX4_CORE) += mlx4/
 obj-$(CONFIG_ENC28J60) += enc28j60.o
+obj-$(CONFIG_ETHOC) += ethoc.o
 
 obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o