Merge branch 'sky2'

diff --combined drivers/net/Kconfig
index ebd7313,1579041..39415b5
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -812,7 -812,7 +812,7 @@@ config SMC91
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
 -      depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH)
 +      depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00)
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
@@@ -2008,7 -2008,25 +2008,25 @@@ config SKG
  
          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