Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
  [EISA] EISA registration with !CONFIG_EISA
  [TC] pmagb-b-fb: Convert to the driver model
  [TC] dec_esp: Driver model for the PMAZ-A
  [TC] mips: pmag-ba-fb: Convert to the driver model
  [TC] defxx: TURBOchannel support
  [TC] TURBOchannel support for the DECstation
  [TC] MIPS: TURBOchannel resources off-by-one fix
  [TC] MIPS: TURBOchannel update to the driver model

diff --combined MAINTAINERS
index f2a7948,3780623..a6c1ebd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1114,7 -1114,7 +1114,7 @@@ S:      Supporte
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:    Tobias Ringstrom
  M:    tori@unhappy.mine.nu
 -L:    linux-kernel@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Maintained
  
  DOCBOOK FOR DOCUMENTATION
@@@ -2361,7 -2361,7 +2361,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  P:    John W. Linville
  M:    linville@tuxdriver.com
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  
@@@ -3037,12 -3037,6 +3037,12 @@@ M:    perex@suse.c
  L:    alsa-devel@alsa-project.org
  S:    Maintained
  
 +SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 +P:    Liam Girdwood
 +M:    liam.girdwood@wolfsonmicro.com
 +L:    alsa-devel@alsa-project.org
 +S:    Supported
 +
  SPI SUBSYSTEM
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
@@@ -3293,6 -3287,11 +3293,11 @@@ L:    vtun@office.satix.ne
  W:    http://vtun.sourceforge.net/tun
  S:    Maintained
  
+ TURBOCHANNEL SUBSYSTEM
+ P:    Maciej W. Rozycki
+ M:    macro@linux-mips.org
+ S:    Maintained
+ 
  U14-34F SCSI DRIVER
  P:    Dario Ballabio
  M:    ballabio_dario@emc.com

diff --combined drivers/net/Kconfig
index 4f2ffbd,b79711d..38f41a5
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -2335,17 -2335,6 +2335,17 @@@ config QLA3XX
          To compile this driver as a module, choose M here: the module
          will be called qla3xxx.
  
 +config ATL1
 +      tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"
 +      depends on NET_PCI && PCI && EXPERIMENTAL
 +      select CRC32
 +      select MII
 +      help
 +        This driver supports the Attansic L1 gigabit ethernet adapter.
 +
 +        To compile this driver as a module, choose M here.  The module
 +        will be called atl1.
 +
  endmenu
  
  #
@@@ -2545,7 -2534,7 +2545,7 @@@ config RIONET_RX_SIZ
  
  config FDDI
        bool "FDDI driver support"
-       depends on (PCI || EISA)
+       depends on (PCI || EISA || TC)
        help
          Fiber Distributed Data Interface is a high speed local area network
          design; essentially a replacement for high speed Ethernet. FDDI can
@@@ -2555,11 -2544,31 +2555,31 @@@
          will say N.
  
  config DEFXX
-       tristate "Digital DEFEA and DEFPA adapter support"
-       depends on FDDI && (PCI || EISA)
-       help
-         This is support for the DIGITAL series of EISA (DEFEA) and PCI
-         (DEFPA) controllers which can connect you to a local FDDI network.
+       tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
+       depends on FDDI && (PCI || EISA || TC)
+       ---help---
+         This is support for the DIGITAL series of TURBOchannel (DEFTA),
+         EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
+         to a local FDDI network.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called defxx.  If unsure, say N.
+ 
+ config DEFXX_MMIO
+       bool
+       prompt "Use MMIO instead of PIO" if PCI || EISA
+       depends on DEFXX
+       default n if PCI || EISA
+       default y
+       ---help---
+         This instructs the driver to use EISA or PCI memory-mapped I/O
+         (MMIO) as appropriate instead of programmed I/O ports (PIO).
+         Enabling this gives an improvement in processing time in parts
+         of the driver, but it may cause problems with EISA (DEFEA)
+         adapters.  TURBOchannel does not have the concept of I/O ports,
+         so MMIO is always used for these (DEFTA) adapters.
+ 
+         If unsure, say N.
  
  config SKFP
        tristate "SysKonnect FDDI PCI support"