---

yaml --- r: 122589 b: refs/heads/master c: 2cb3772 h: refs/heads/master i: 122587: 623aa6c v: v3
git-mirror · Dec 12, 2008 · 8f2b24f · 8f2b24f
1 parent 64255d9
commit 8f2b24f
Show file tree

Hide file tree

Showing 6 changed files with 1,907 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea943d41a8770857d50029fdc8fd111635c21a1f
+refs/heads/master: 2cb377283f3469d66f0ea7358015abfe8366e5d0
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3915,6 +3915,12 @@ M:	steve.glendinning@smsc.com
 L:	netdev@vger.kernel.org
 S:	Supported
 
+SMSC9420 PCI ETHERNET DRIVER
+P:	Steve Glendinning
+M:	steve.glendinning@smsc.com
+L:	netdev@vger.kernel.org
+S:	Supported
+
 SMX UIO Interface
 P:	Ben Nizette
 M:	bn@niasdigital.com

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1638,6 +1638,22 @@ config EPIC100
 	  More specific information and updates are available from
 	  <http://www.scyld.com/network/epic100.html>.
 
+config SMSC9420
+	tristate "SMSC LAN9420 PCI ethernet adapter support"
+	depends on NET_PCI && PCI
+	select CRC32
+	select PHYLIB
+	select SMSC_PHY
+	help
+	  This is a driver for SMSC's LAN9420 PCI ethernet adapter.
+	  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 smsc9420.  If you want to compile it as a module, say M
+	  here and read <file:Documentation/kbuild/modules.txt>
+
 config SUNDANCE
 	tristate "Sundance Alta support"
 	depends on NET_PCI && PCI

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
+obj-$(CONFIG_SMSC9420) += smsc9420.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o