diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:54:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:54:33 -0700 |
| commit | 4ec5240ec367a592834385893200dd4fb369354c (patch) | |
| tree | 3ac9a34948049bff79a2b2ce49c0a3c84e35a748 /drivers/net/Kconfig | |
| parent | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (diff) | |
| parent | b6016b767397258b58163494a869f8f1199e6897 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7c5c1acd1474..f08e01b2fd19 100644 --- 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 |