---

yaml --- r: 78937 b: refs/heads/master c: a2fbb9e h: refs/heads/master i: 78935: 6df6c30 v: v3
git-mirror · Jan 28, 2008 · 59fbab2 · 59fbab2
1 parent 4174a2f
commit 59fbab2
Show file tree

Hide file tree

Showing 11 changed files with 23,848 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa4f7969f3340606f46515560ce193d9bd74ea4
+refs/heads/master: a2fbb9ea235467b0be6db3cec0132b6c83c0b9fb
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2597,6 +2597,15 @@ config TEHUTI
 	help
 	  Tehuti Networks 10G Ethernet NIC
 
+config BNX2X
+	tristate "Broadcom NetXtremeII 10Gb support"
+	depends on PCI
+	help
+	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
+	  To compile this driver as a module, choose M here: the module
+	  will be called bnx2x.  This is recommended.
+
+
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -65,6 +65,7 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
+obj-$(CONFIG_BNX2X) += bnx2x.o
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o