Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/…

…davem/net-2.6
git-mirror · May 26, 2005 · 4ec5240 · 4ec5240
2 parents f49809f + b6016b7
commit 4ec5240
Show file tree

Hide file tree

Showing 15 changed files with 12,499 additions and 133 deletions.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
@@ -2032,6 +2032,15 @@ config TIGON3
 	  To compile this driver as a module, choose M here: the module
 	  will be called tg3.  This is recommended.
 
+config BNX2
+	tristate "Broadcom NetXtremeII support"
+	depends on PCI
+	help
+	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called bnx2.  This is recommended.
+
 config GIANFAR
 	tristate "Gianfar Ethernet"
 	depends on 85xx || 83xx

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
+obj-$(CONFIG_BNX2) += bnx2.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/