Automatic merge of /spare/repo/netdev-2.6 branch skge

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 60e3b968553ae4762e6ad46473e9a9b23470af21..fa9f76c953ddaf930ca929f05c1d3702bf4088c7 100644 (file)
--- 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