Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec5240e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

parents f49809fe b6016b76

drivers/net/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/