summaryrefslogtreecommitdiff
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 22:48:14 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 22:48:14 -0500
commit06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (patch)
tree2ce1fb910566961de2d2ff1f2f01a9c0546d8092 /drivers/net/Kconfig
parent34afd638d0b0698e66b6aa4f749face019a3e90f (diff)
parentd0bbccfa3297d3ef6ae4691585abde9a6c26b186 (diff)
Merge branch 'sky2'
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig20
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ebd7313d7fc1..39415b5c4569 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2008,7 +2008,25 @@ config SKGE
It does not support the link failover and network management
features that "portable" vendor supplied sk98lin driver does.
-
+
+
+config SKY2
+ tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
+ depends on PCI && EXPERIMENTAL
+ select CRC32
+ ---help---
+ This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sky2. This is recommended.
+
+config SKY2_EC_A1
+ bool "Support old Yukon-EC A1 chipset"
+ depends on SKY2
+ ---help---
+ Include support for early revisions of the Yukon EC chipset
+ that required extra workarounds. If in doubt, say N.
+
config SK98LIN
tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
depends on PCI