diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /drivers/net/Kconfig | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-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) |