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

diff --combined drivers/net/Kconfig
index 60e3b96,959f8ae..fa9f76c
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -824,18 -824,6 +824,18 @@@ config SMC919
          <file:Documentation/networking/net-modules.txt>. The module
          will be called smc9194.
  
 +config DM9000
 +      tristate "DM9000 support"
 +      depends on ARM && NET_ETHERNET
 +      select CRC32
 +      select MII
 +      ---help---
 +        Support for DM9000 chipset.
 +
 +        To compile this driver as a module, choose M here and read
 +        <file:Documentation/networking/net-modules.txt>.  The module will be
 +        called dm9000.
 +
  config NET_VENDOR_RACAL
        bool "Racal-Interlan (Micom) NI cards"
        depends on NET_ETHERNET && ISA
@@@ -1001,6 -989,21 +1001,6 @@@ config EEXPRESS_PR
          <file:Documentation/networking/net-modules.txt>. The module
          will be called eepro.
  
 -config FMV18X
 -      tristate "FMV-181/182/183/184 support (OBSOLETE)"
 -      depends on NET_ISA && OBSOLETE
 -      ---help---
 -        If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,
 -        say Y and read the Ethernet-HOWTO, available from
 -        <http://www.tldp.org/docs.html#howto>.
 -
 -        If you use an FMV-183 or FMV-184 and it is not working, you may need
 -        to disable Plug & Play mode of the card.
 -
 -        To compile this driver as a module, choose M here and read
 -        <file:Documentation/networking/net-modules.txt>. The module
 -        will be called fmv18x.
 -
  config HPLAN_PLUS
        tristate "HP PCLAN+ (27247B and 27252A) support"
        depends on NET_ISA
@@@ -1089,6 -1092,14 +1089,6 @@@ config SEEQ800
          <file:Documentation/networking/net-modules.txt>. The module
          will be called seeq8005.
  
 -config SK_G16
 -      tristate "SK_G16 support (OBSOLETE)"
 -      depends on NET_ISA && OBSOLETE
 -      help
 -        If you have a network (Ethernet) card of this type, say Y and read
 -        the Ethernet-HOWTO, available from
 -        <http://www.tldp.org/docs.html#howto>.
 -
  config SKMC
        tristate "SKnet MCA support"
        depends on NET_ETHERNET && MCA && BROKEN
@@@ -1544,7 -1555,6 +1544,7 @@@ config SIS90
        tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
        select CRC32
 +      select MII
        ---help---
          This is a driver for the Fast Ethernet PCI network cards based on
          the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
@@@ -1921,6 -1931,18 +1921,18 @@@ config R8169_VLA
          
          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
@@@ -2021,15 -2043,6 +2033,15 @@@ config TIGON
          To compile this driver as a module, choose M here: the module
          will be called tg3.  This is recommended.
  
 +config BNX2
 +      tristate "Broadcom NetXtremeII support"
 +      depends on PCI
 +      help
 +        This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called bnx2.  This is recommended.
 +
  config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx

diff --combined drivers/net/Makefile
index a8a6567,43c441a..63c6d1e
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -51,8 -51,8 +51,9 @@@ obj-$(CONFIG_NS83820) += ns83820.
  obj-$(CONFIG_STNIC) += stnic.o 8390.o
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
 +obj-$(CONFIG_BNX2) += bnx2.o
  obj-$(CONFIG_TC35815) += tc35815.o
+ obj-$(CONFIG_SKGE) += skge.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@@ -74,6 -74,7 +75,6 @@@ obj-$(CONFIG_MAC8390) += mac8390.o 8390
  obj-$(CONFIG_APNE) += apne.o 8390.o
  obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
  obj-$(CONFIG_SHAPER) += shaper.o
 -obj-$(CONFIG_SK_G16) += sk_g16.o
  obj-$(CONFIG_HP100) += hp100.o
  obj-$(CONFIG_SMC9194) += smc9194.o
  obj-$(CONFIG_FEC) += fec.o
@@@ -121,6 -122,7 +122,6 @@@ obj-$(CONFIG_DEFXX) += defxx.
  obj-$(CONFIG_SGISEEQ) += sgiseeq.o
  obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
  obj-$(CONFIG_AT1700) += at1700.o
 -obj-$(CONFIG_FMV18X) += fmv18x.o
  obj-$(CONFIG_EL1) += 3c501.o
  obj-$(CONFIG_EL16) += 3c507.o
  obj-$(CONFIG_ELMC) += 3c523.o
@@@ -178,7 -180,6 +179,7 @@@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.
  obj-$(CONFIG_IBMVETH) += ibmveth.o
  obj-$(CONFIG_S2IO) += s2io.o
  obj-$(CONFIG_SMC91X) += smc91x.o
 +obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  
  obj-$(CONFIG_ARM) += arm/
@@@ -187,7 -188,7 +188,7 @@@ obj-$(CONFIG_TR) += tokenring
  obj-$(CONFIG_WAN) += wan/
  obj-$(CONFIG_ARCNET) += arcnet/
  obj-$(CONFIG_NET_PCMCIA) += pcmcia/
 -obj-$(CONFIG_NET_WIRELESS) += wireless/
 +obj-$(CONFIG_NET_RADIO) += wireless/
  obj-$(CONFIG_NET_TULIP) += tulip/
  obj-$(CONFIG_HAMRADIO) += hamradio/
  obj-$(CONFIG_IRDA) += irda/