Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.

diff --combined drivers/net/Kconfig
index 1e50b8e32add42eeb3991809920509365ff7373a,8edb6936fb9b846810645f6f3f6de4164dec172a..79e8aa6f2b9edfc215e43b1a1b0a934274a680f4
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -131,8 -131,6 +131,8 @@@ config NET_SB100
  
        source "drivers/net/arcnet/Kconfig"
  
 +source "drivers/net/phy/Kconfig"
 +
  #
  #     Ethernet
  #
@@@ -1147,7 -1145,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---
@@@ -1156,7 -1154,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"

diff --combined drivers/net/tokenring/Kconfig
index 7d5c23e8cdd7f8fc9794ff816a6056b34df2f58c,7e99e9f8045e176213949a534178ada137b342d9..e4cfc80b283b74a4ead414593340520f5be9554c
--- 1/drivers/net/tokenring/Kconfig
--- 2/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@@ -84,7 -84,7 +84,7 @@@ config 3C35
  
  config TMS380TR
        tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
-       depends on TR && (PCI || ISA || MCA)
 -      depends on TR && (PCI || ISA && ISA_DMA_API)
++      depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
        select FW_LOADER
        ---help---
          This driver provides generic support for token ring adapters
@@@ -158,7 -158,7 +158,7 @@@ config ABYS
  
  config MADGEMC
        tristate "Madge Smart 16/4 Ringnode MicroChannel"
 -      depends on TR && TMS380TR && MCA_LEGACY
 +      depends on TR && TMS380TR && MCA
        help
          This tms380 module supports the Madge Smart 16/4 MC16 and MC32
          MicroChannel adapters.