---

yaml --- r: 46526 b: refs/heads/master c: bf34570 h: refs/heads/master v: v3
git-mirror · Feb 5, 2007 · 454dde6 · 454dde6
1 parent 3a1ba07
commit 454dde6
Show file tree

Hide file tree

Showing 4 changed files with 1,634 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae306cca3ada3c84f3e30e1091a98d99ee1d0557
+refs/heads/master: bf345707299b34de90fbae062eff51e76561eb40
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1788,6 +1788,18 @@ config LAN_SAA9730
 	  workstations.
 	  See <http://www.semiconductors.philips.com/pip/SAA9730_flyer_1>.
 
+config SC92031
+	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+	depends on NET_PCI && PCI && EXPERIMENTAL
+	select CRC32
+	---help---
+	  This is a driver for the Fast Ethernet PCI network cards based on
+	  the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+	  have one of these, say Y here.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sc92031.  This is recommended.
+
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on NET_ETHERNET && PARPORT

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -160,6 +160,7 @@ obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_MVME16x_NET) += 82596.o
 obj-$(CONFIG_BVME6000_NET) += 82596.o
+obj-$(CONFIG_SC92031) += sc92031.o
 
 # This is also a 82596 and should probably be merged
 obj-$(CONFIG_LP486E) += lp486e.o