diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:52:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:52:21 -0500 |
| commit | a03b1950521466e007288a25c9fc7ac7f05a97e5 (patch) | |
| tree | d1e9486b6e21bde1d80113ce9abe933e51364826 /drivers/net | |
| parent | 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 (diff) | |
| parent | c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e (diff) | |
| download | kernel-crypto-a03b1950521466e007288a25c9fc7ac7f05a97e5.tar.gz kernel-crypto-a03b1950521466e007288a25c9fc7ac7f05a97e5.tar.xz kernel-crypto-a03b1950521466e007288a25c9fc7ac7f05a97e5.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 626508afe1b..6a6a0844180 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2034,13 +2034,28 @@ config SKGE It does not support the link failover and network management features that "portable" vendor supplied sk98lin driver does. + This driver supports adapters based on the original Yukon chipset: + Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T, + Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. + + It does not support the newer Yukon2 chipset: a separate driver, + sky2, is provided for Yukon2-based adapters. + + To compile this driver as a module, choose M here: the module + will be called skge. This is recommended. config SKY2 tristate "SysKonnect Yukon2 support (EXPERIMENTAL)" depends on PCI && EXPERIMENTAL select CRC32 ---help--- - This driver support the Marvell Yukon 2 Gigabit Ethernet adapter. + This driver supports Gigabit Ethernet adapters based on the the + Marvell Yukon 2 chipset: + Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ + 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 + + This driver does not support the original Yukon chipset: a seperate + driver, skge, is provided for Yukon-based adapters. To compile this driver as a module, choose M here: the module will be called sky2. This is recommended. @@ -2050,8 +2065,15 @@ config SK98LIN depends on PCI ---help--- Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx - compliant Gigabit Ethernet Adapter. The following adapters are supported - by this driver: + compliant Gigabit Ethernet Adapter. + + This driver supports the original Yukon chipset. A cleaner driver is + also available (skge) which seems to work better than this one. + + This driver does not support the newer Yukon2 chipset. A seperate + driver, sky2, is provided to support Yukon2-based adapters. + + The following adapters are supported by this driver: - 3Com 3C940 Gigabit LOM Ethernet Adapter - 3Com 3C941 Gigabit LOM Ethernet Adapter - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter |