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

1 files changed, 26 insertions, 6 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4f2ffbd81dc1..38f41a593b12 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2545,7 +2545,7 @@ config RIONET_RX_SIZE
 
 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 +2555,31 @@ config FDDI
           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"