diff -urN linux-2.4.33/Documentation/Configure.help linux-2.4.33-bnx2/Documentation/Configure.help --- linux-2.4.33/Documentation/Configure.help 2006-03-01 00:01:47 +0100 +++ linux-2.4.33-bnx2/Documentation/Configure.help 2006-10-23 14:44:34 +0200 @@ -12165,6 +12165,15 @@ say M here and read . This is recommended. The module will be called tg3.o. +Broadcom NetXtreme II support +CONFIG_BNX2 + This driver supports Broadcom NetXtreme II based gigabit Ethernet cards. + + If you want to compile this driver as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read . This is + recommended. The module will be called bnx2.o. + MV-64340 Ethernet support CONFIG_MV64340_ETH This driver supports the Marvell Discovery II MV64340 device diff -urN linux-2.4.33/drivers/net/Config.in linux-2.4.33-bnx2/drivers/net/Config.in --- linux-2.4.33/drivers/net/Config.in 2005-01-27 18:57:32 +0100 +++ linux-2.4.33-bnx2/drivers/net/Config.in 2006-10-23 14:48:08 +0200 @@ -274,6 +274,7 @@ fi dep_tristate 'Marvell Yukon Chipset / SysKonnect SK-98xx Support' CONFIG_SK98LIN $CONFIG_PCI dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI +dep_tristate 'Broadcom NetXtreme II support' CONFIG_BNX2 $CONFIG_PCI if [ "$CONFIG_MOMENCO_OCELOT_C" = "y" -o "$CONFIG_MOMENCO_JAGUAR_ATX" = "y" ]; then bool ' MV-64340 Ethernet support' CONFIG_MV64340_ETH diff -urN linux-2.4.33/drivers/net/Makefile linux-2.4.33-bnx2/drivers/net/Makefile --- linux-2.4.33/drivers/net/Makefile 2005-01-27 18:57:32 +0100 +++ linux-2.4.33-bnx2/drivers/net/Makefile 2006-10-23 14:46:12 +0200 @@ -96,6 +96,11 @@ obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_TIGON3) += tg3.o +subdir-$(CONFIG_BNX2) += bnx2 +ifeq ($(CONFIG_BNX2),y) + obj-y += bnx2/bnx2.o +endif + ifeq ($(CONFIG_E100),y) obj-y += e100/e100.o endif diff -urN linux-2.4.33/drivers/net/bnx2/Makefile linux-2.4.33-bnx2/drivers/net/bnx2/Makefile --- linux-2.4.33/drivers/net/bnx2/Makefile 1970-01-01 01:00:00 +0100 +++ linux-2.4.33-bnx2/drivers/net/bnx2/Makefile 2006-10-23 14:47:09 +0200 @@ -0,0 +1,9 @@ +# +# Makefile for the Broadcom NetXtreme II +# +O_TARGET := bnx2.o +obj-y := bnx2.o +obj-m := $(O_TARGET) + +include $(TOPDIR)/Rules.make +