Merge /spare/repo/linux-2.6/

diff --combined drivers/net/Kconfig
index 4d7489a,54fff9c..a584f03
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -131,6 -131,8 +131,8 @@@ config NET_SB100
  
        source "drivers/net/arcnet/Kconfig"
  
+ source "drivers/net/phy/Kconfig"
+ 
  #
  #     Ethernet
  #
@@@ -395,7 -397,7 +397,7 @@@ config SUN3LANC
          If you're not building a kernel for a Sun 3, say N.
  
  config SUN3_82586
-       tristate "Sun3 on-board Intel 82586 support"
+       bool "Sun3 on-board Intel 82586 support"
        depends on NET_ETHERNET && SUN3
        help
          This driver enables support for the on-board Intel 82586 based
@@@ -445,7 -447,7 +447,7 @@@ config NET_SB1250_MA
  
  config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
-       depends on NET_ETHERNET && PCI && SGI_IP27
+       depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN
        select CRC32
        select MII
        help
@@@ -1145,7 -1147,7 +1147,7 @@@ config IBMVET
          be called ibmveth.
  
  config IBM_EMAC
-       tristate "IBM PPC4xx EMAC driver support"
+       bool "IBM PPC4xx EMAC driver support"
        depends on 4xx
        select CRC32
        ---help---
@@@ -1154,7 -1156,7 +1156,7 @@@
  
  config IBM_EMAC_ERRMSG
        bool "Verbose error messages"
-       depends on IBM_EMAC
+       depends on IBM_EMAC && BROKEN
  
  config IBM_EMAC_RXB
        int "Number of receive buffers"
@@@ -1736,11 -1738,18 +1738,18 @@@ config 68360_ENE
          the Motorola 68360 processor.
  
  config FEC
-       bool "FEC ethernet controller (of ColdFire 5272)"
-       depends on M5272 || M5282
+       bool "FEC ethernet controller (of ColdFire CPUs)"
+       depends on M523x || M527x || M5272 || M528x
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
-         controller on the Motorola ColdFire 5272 processor.
+         controller on some Motorola ColdFire processors.
+ 
+ config FEC2
+       bool "Second FEC ethernet controller (on some ColdFire CPUs)"
+       depends on FEC
+       help
+         Say Y here if you want to use the second built-in 10/100 Fast
+         ethernet controller on some Motorola ColdFire processors.
  
  config NE_H8300
        tristate "NE2000 compatible support for H8/300"
@@@ -1921,6 -1930,20 +1930,20 @@@ config R8169_VLA
          
          If in doubt, say Y.
  
+ config SIS190
+       tristate "SiS190/SiS191 gigabit ethernet support"
+       depends on PCI
+       select CRC32
+       select MII
+       ---help---
+         Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+         a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+         appear in lan on motherboard designs which are based on SiS 965
+         and SiS 966 south bridge.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called sis190.  This is recommended.
+ 
  config SKGE
        tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL
@@@ -1932,25 -1955,7 +1955,25 @@@
  
          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
@@@ -2060,6 -2065,13 +2083,13 @@@ config BNX
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
  
+ config SPIDER_NET
+       tristate "Spider Gigabit Ethernet driver"
+       depends on PCI && PPC_BPA
+       help
+         This driver supports the Gigabit Ethernet chips present on the
+         Cell Processor-Based Blades from IBM.
+ 
  config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx
@@@ -2109,6 -2121,25 +2139,25 @@@ endmen
  menu "Ethernet (10000 Mbit)"
        depends on !UML
  
+ config CHELSIO_T1
+         tristate "Chelsio 10Gb Ethernet support"
+         depends on PCI
+         help
+           This driver supports Chelsio N110 and N210 models 10Gb Ethernet
+           cards. More information about adapter features and performance
+           tuning is in <file:Documentation/networking/cxgb.txt>.
+ 
+           For general information about Chelsio and our products, visit
+           our website at <http://www.chelsio.com>.
+ 
+           For customer support, please visit our customer support page at
+           <http://www.chelsio.com/support.htm>.
+ 
+           Please send feedback to <linux-bugs@chelsio.com>.
+ 
+           To compile this driver as a module, choose M here: the module
+           will be called cxgb.
+ 
  config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI

diff --combined drivers/net/Makefile
index 7e5c0d4,8645c84..c849afc
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -9,6 -9,7 +9,7 @@@ endi
  obj-$(CONFIG_E1000) += e1000/
  obj-$(CONFIG_IBM_EMAC) += ibm_emac/
  obj-$(CONFIG_IXGB) += ixgb/
+ obj-$(CONFIG_CHELSIO_T1) += chelsio/
  obj-$(CONFIG_BONDING) += bonding/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
  
@@@ -42,6 -43,7 +43,7 @@@ obj-$(CONFIG_EEPRO100) += eepro100.
  obj-$(CONFIG_E100) += e100.o
  obj-$(CONFIG_TLAN) += tlan.o
  obj-$(CONFIG_EPIC100) += epic100.o
+ obj-$(CONFIG_SIS190) += sis190.o
  obj-$(CONFIG_SIS900) += sis900.o
  obj-$(CONFIG_YELLOWFIN) += yellowfin.o
  obj-$(CONFIG_ACENIC) += acenic.o
@@@ -52,9 -54,10 +54,11 @@@ obj-$(CONFIG_STNIC) += stnic.o 8390.
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
  obj-$(CONFIG_BNX2) += bnx2.o
+ spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
+ obj-$(CONFIG_SPIDER_NET) += spidernet.o
  obj-$(CONFIG_TC35815) += tc35815.o
  obj-$(CONFIG_SKGE) += skge.o
 +obj-$(CONFIG_SKY2) += sky2.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@@ -66,6 -69,7 +70,7 @@@ obj-$(CONFIG_ADAPTEC_STARFIRE) += starf
  #
  
  obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_PHYLIB) += phy/
  
  obj-$(CONFIG_SUNDANCE) += sundance.o
  obj-$(CONFIG_HAMACHI) += hamachi.o