Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[platform/kernel/linux-rpi.git] / drivers / video / console / Kconfig

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 198574b..4110ba7 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -8,7 +8,7 @@ config VGA_CONSOLE
        bool "VGA text console" if EXPERT || !X86
        depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC &&  !SUPERH && \
                (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
-               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32
+               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
@@ -84,7 +84,7 @@ config MDA_CONSOLE
 
 config SGI_NEWPORT_CONSOLE
         tristate "SGI Newport Console support"
-        depends on SGI_IP22 
+       depends on SGI_IP22 && HAS_IOMEM
         select FONT_SUPPORT
         help
           Say Y here if you want the console on the Newport aka XL graphics
@@ -152,7 +152,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
 
 config STI_CONSOLE
         bool "STI text console"
-        depends on PARISC
+       depends on PARISC && HAS_IOMEM
         select FONT_SUPPORT
         default y
         help