---

yaml --- r: 27251 b: refs/heads/master c: 0a0c72c h: refs/heads/master i: 27249: d968ed1 27247: 1274413 v: v3
git-mirror · Apr 20, 2006 · 628ffdf · 628ffdf
1 parent 51b7168
commit 628ffdf
Show file tree

Hide file tree

Showing 5 changed files with 3,160 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89be0501a013737d562f56ce1c5a2ff075995b11
+refs/heads/master: 0a0c72c9118c4e63080eb409f0cfdf15808d23a4
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -865,6 +865,22 @@ config DM9000
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
 	  called dm9000.
 
+config SMC911X
+	tristate "SMSC LAN911[5678] support"
+	select CRC32
+	select MII
+	depends on NET_ETHERNET
+	help
+	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
+	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
+	  Say Y if you want it compiled into the kernel, 
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.linuxdoc.org/docs.html#howto>.
+
+	  This driver is also available as a module. The module will be 
+	  called smc911x.  If you want to compile it as a module, say M 
+	  here and read <file:Documentation/modules.txt>
+
 config NET_VENDOR_RACAL
 	bool "Racal-Interlan (Micom) NI cards"
 	depends on NET_ETHERNET && ISA

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -193,6 +193,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_SMC91X) += smc91x.o
+obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/