diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:56:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:56:47 -0400 |
| commit | eb693d2994eb762b2201aead31066265ab0be20b (patch) | |
| tree | 424e1e7f3d272d0fd5888435176b386594ce121f /drivers/net/Kconfig | |
| parent | 6dec3cf5cdb600f39b9eac3349f6bf50eab87731 (diff) | |
| parent | 01d40f28b125e0a9aa0ec24642be67fc4c5dfaff (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 96f14ab1c1f5..2a908c4690a7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -548,6 +548,14 @@ config SUNGEM | |||
| 548 | Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also | 548 | Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also |
| 549 | <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>. | 549 | <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>. |
| 550 | 550 | ||
| 551 | config CASSINI | ||
| 552 | tristate "Sun Cassini support" | ||
| 553 | depends on NET_ETHERNET && PCI | ||
| 554 | select CRC32 | ||
| 555 | help | ||
| 556 | Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also | ||
| 557 | <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf> | ||
| 558 | |||
| 551 | config NET_VENDOR_3COM | 559 | config NET_VENDOR_3COM |
| 552 | bool "3COM cards" | 560 | bool "3COM cards" |
| 553 | depends on NET_ETHERNET && (ISA || EISA || MCA || PCI) | 561 | depends on NET_ETHERNET && (ISA || EISA || MCA || PCI) |