diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 17:54:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 17:54:39 -0400 |
| commit | 2089a0d38bc9c2cdd084207ebf7082b18cf4bf58 (patch) | |
| tree | ecdbd64b6587bab6f5c4dac03a0fd10f70cf3026 /drivers/net/Kconfig | |
| parent | 03d661d3d7dd2c20330d775c13157419049f1617 (diff) | |
| parent | 0b2d7fea1c3893c3790e0b89c310ec1321f1b8c0 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch skge
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 60e3b968553..fa9f76c953d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1921,6 +1921,18 @@ config R8169_VLAN If in doubt, say Y. +config SKGE + tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)" + depends on PCI && EXPERIMENTAL + select CRC32 + ---help--- + This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx + and related Gigabit Ethernet adapters. It is a new smaller driver + driver with better performance and more complete ethtool support. + + It does not support the link failover and network management + features that "portable" vendor supplied sk98lin driver does. + config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" depends on PCI |