[LV-k25-commit] kernel-2.5/drivers/video/console Kconfig,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/console
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17472/drivers/video/console

Modified Files:
	Kconfig 
Log Message:
Merge with 2.6.9


Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/console/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig	2 Sep 2004 19:51:19 -0000	1.3
+++ Kconfig	17 Nov 2004 00:23:31 -0000	1.4
@@ -6,7 +6,7 @@
 
 config VGA_CONSOLE
 	bool "VGA text console" if EMBEDDED || !X86
-	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !VAX
+	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !VAX && !PARISC
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a
@@ -43,7 +43,7 @@
 	  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 @@
 #  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