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

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 60e3b968553a..fa9f76c953dd 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