diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/benet/Kconfig | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/benet/Kconfig')
| -rw-r--r-- | drivers/net/benet/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/benet/Kconfig b/drivers/net/benet/Kconfig new file mode 100644 index 000000000000..c6934f179c09 --- /dev/null +++ b/drivers/net/benet/Kconfig | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | config BE2NET | ||
| 2 | tristate "ServerEngines' 10Gbps NIC - BladeEngine 2" | ||
| 3 | depends on PCI && INET | ||
| 4 | select INET_LRO | ||
| 5 | help | ||
| 6 | This driver implements the NIC functionality for ServerEngines' | ||
| 7 | 10Gbps network adapter - BladeEngine 2. | ||