Merge branch 'master'

[net-next-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5148d47492a0c1b90eb225826ff85ea0a0c046f9..b39cba36d15e1078c5b2c23e702c6668ab1bd266 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1971,7 +1971,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