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 b99e719..4110ba7 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,10 +6,9 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
        bool "VGA text console" if EXPERT || !X86
-       depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \
-               !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
+       depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC &&  !SUPERH && \
                (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
-               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM && !S390
+               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a