---

yaml --- r: 66923 b: refs/heads/master c: a3138df h: refs/heads/master i: 66921: 89be7af 66919: ae2216a v: v3
git-mirror · Oct 10, 2007 · 86f6fa0 · 86f6fa0
1 parent 47d790d
commit 86f6fa0
Show file tree

Hide file tree

Showing 5 changed files with 11,170 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a5409a5a850c84505d658ddf36f98b2c542ec07
+refs/heads/master: a3138df9f20e726c517f8df7387b5d83f5df5566
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2594,6 +2594,13 @@ config NETXEN_NIC
 	help
 	  This enables the support for NetXen's Gigabit Ethernet card.
 
+config NIU
+	tristate "Sun Neptune 10Gbit Ethernet support"
+	depends on PCI
+	help
+	  This enables support for cards based upon Sun's
+	  Neptune chipset.
+
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC64 && PCI

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -241,3 +241,4 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
 obj-$(CONFIG_NETXEN_NIC) += netxen/
+obj-$(CONFIG_NIU) += niu.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -241,3 +241,4 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
		obj-$(CONFIG_FS_ENET) += fs_enet/

		obj-$(CONFIG_NETXEN_NIC) += netxen/
		obj-$(CONFIG_NIU) += niu.o