---

yaml --- r: 300517 b: refs/heads/master c: 8b1467a h: refs/heads/master i: 300515: 784b214 v: v3
git-mirror · Apr 5, 2012 · c1f8d5f · c1f8d5f
1 parent bcbccc2
commit c1f8d5f
Show file tree

Hide file tree

Showing 4 changed files with 822 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9899b81e7ca5c285b825ff10ca9357dd18813d83
+refs/heads/master: 8b1467a31343ade557489aff2bf4c2be44ca2725
diff --git a/trunk/drivers/net/ethernet/wiznet/Kconfig b/trunk/drivers/net/ethernet/wiznet/Kconfig
@@ -17,6 +17,18 @@ config NET_VENDOR_WIZNET
 
 if NET_VENDOR_WIZNET
 
+config WIZNET_W5100
+	tristate "WIZnet W5100 Ethernet support"
+	---help---
+	  Support for WIZnet W5100 chips.
+
+	  W5100 is a single chip with integrated 10/100 Ethernet MAC,
+	  PHY and hardware TCP/IP stack, but this driver is limited to
+	  the MAC and PHY functions only, onchip TCP/IP is unused.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called w5100.
+
 config WIZNET_W5300
 	tristate "WIZnet W5300 Ethernet support"
 	---help---

diff --git a/trunk/drivers/net/ethernet/wiznet/Makefile b/trunk/drivers/net/ethernet/wiznet/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_WIZNET_W5100) += w5100.o
 obj-$(CONFIG_WIZNET_W5300) += w5300.o
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		obj-$(CONFIG_WIZNET_W5100) += w5100.o
		obj-$(CONFIG_WIZNET_W5300) += w5300.o