---

yaml --- r: 166702 b: refs/heads/master c: a55c0a0 h: refs/heads/master v: v3
git-mirror · Oct 1, 2009 · b393410 · b393410
1 parent 725aec7
commit b393410
Show file tree

Hide file tree

Showing 4 changed files with 1,706 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1914226e12044f0cacda59efc91bee972c30341
+refs/heads/master: a55c0a0ed41533b3a7b32a6c8acdc1bb04a017b5
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1738,6 +1738,13 @@ config KS8851
        help
          SPI driver for Micrel KS8851 SPI attached network chip.
 
+config KS8851_MLL
+	tristate "Micrel KS8851 MLL"
+	depends on HAS_IOMEM
+	help
+	  This platform driver is for Micrel KS8851 Address/data bus
+	  multiplexed network chip.
+
 config VIA_RHINE
 	tristate "VIA Rhine support"
 	depends on NET_PCI && PCI

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_SKY2) += sky2.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_KS8842)	+= ks8842.o
 obj-$(CONFIG_KS8851)	+= ks8851.o
+obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
 obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o