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, 4 insertions, 4 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4e83f01e894e..45fe65d8d7a0 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1444,8 +1444,8 @@ config FB_PMAG_AA
           used mainly in the MIPS-based DECstation series.
 
 config FB_PMAG_BA
-        bool "PMAG-BA TURBOchannel framebuffer support"
-        depends on (FB = y) && TC
+        tristate "PMAG-BA TURBOchannel framebuffer support"
+        depends on FB && TC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -1454,8 +1454,8 @@ config FB_PMAG_BA
           used mainly in the MIPS-based DECstation series.
 
 config FB_PMAGB_B
-        bool "PMAGB-B TURBOchannel framebuffer support"
-        depends on (FB = y) && TC
+        tristate "PMAGB-B TURBOchannel framebuffer support"
+        depends on TC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT