vserver 1.9.3

[linux-2.6.git] / drivers / video / console / Kconfig

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5bc0ef0..85e796b 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
        bool "VGA text console" if EMBEDDED || !X86
-       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K
+       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
@@ -43,7 +43,7 @@ config VIDEO_SELECT
          about the Video mode selection support. If unsure, say N.
 
 config MDA_CONSOLE
-       depends on !M68K
+       depends on !M68K && ISA
        tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
        ---help---
          Say Y here if you have an old MDA or monochrome Hercules graphics
@@ -67,7 +67,7 @@ config SGI_NEWPORT_CONSOLE
 #  bool 'IODC console' CONFIG_IODC_CONSOLE
 config STI_CONSOLE
         tristate "STI text console" 
-        depends on PARISC
+        depends on PARISC && FRAMEBUFFER_CONSOLE
         default y
         help
           The STI console is the builtin display/keyboard on HP-PARISC