---

yaml --- r: 46575 b: refs/heads/master c: f5cd787 h: refs/heads/master i: 46573: 0246afa 46571: 898b14e 46567: c37f034 46559: 5dde75c v: v3
git-mirror · Feb 5, 2007 · 8ed4157 · 8ed4157
1 parent 9a164fb
commit 8ed4157
Show file tree

Hide file tree

Showing 7 changed files with 1,496 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ee6dd770b2302e32fdae489f4fc58c374399da4
+refs/heads/master: f5cd7872768d5856b1b409a33f516e5ac7798f75
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2477,6 +2477,12 @@ L:	orinoco-devel@lists.sourceforge.net
 W:	http://www.nongnu.org/orinoco/
 S:	Maintained
 
+PA SEMI ETHERNET DRIVER
+P:	Olof Johansson
+M:	olof@lixom.net
+L:	netdev@vger.kernel.org
+S:	Maintained
+
 PARALLEL PORT SUPPORT
 P:	Phil Blundell
 M:	philb@gnu.org

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2493,6 +2493,13 @@ config NETXEN_NIC
 	help
 	  This enables the support for NetXen's Gigabit Ethernet card.
 
+config PASEMI_MAC
+	tristate "PA Semi 1/10Gbit MAC"
+	depends on PPC64 && PCI
+	help
+	  This driver supports the on-chip 1/10Gbit Ethernet controller on
+	  PA Semi's PWRficient line of chips.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -195,6 +195,7 @@ obj-$(CONFIG_SMC91X) += smc91x.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
 
 obj-$(CONFIG_MACB) += macb.o