[parisc-linux-cvs] linux-2.5 tausq

[Randolph Chung]

> Fix to allow virtual consoles to work

if the console is on an (e.g.) pci device, then the console 'switch' structure
is not yet initialized by the time the VT is initialized. We use the
dummy console to work around this.

Index: arch/parisc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- arch/parisc/Kconfig	1 Nov 2002 00:31:16 -0000	1.3
+++ arch/parisc/Kconfig	2 Nov 2002 17:49:45 -0000
@@ -3,7 +3,7 @@
 # see the Configure script.
 #
 
-mainmenu "Linux Kernel Configuration"
+mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC
 	bool
@@ -322,6 +322,11 @@ config STI_CONSOLE
 	  The STI console is the builtin display/keyboard on HP-PARISC
 	  machines.  Say Y here to build support for it into your kernel.
 	  The alternative is to use your primary serial port as a console.
+
+config DUMMY_CONSOLE
+	bool
+	depends on STI_CONSOLE || SERIAL_8250_CONSOLE
+	default y
 
 source "drivers/video/Kconfig"
 
Index: arch/parisc/kernel/setup.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/setup.c,v
retrieving revision 1.7
diff -u -p -r1.7 setup.c
--- arch/parisc/kernel/setup.c	17 Oct 2002 21:58:06 -0000	1.7
+++ arch/parisc/kernel/setup.c	2 Nov 2002 17:49:45 -0000
@@ -143,10 +143,8 @@ void __init setup_arch(char **cmdline_p)
 	dma_ops_init();
 #endif
 
-#ifdef CONFIG_VT
-# if defined(CONFIG_STI_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
+#ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;        /* we use take_over_console() later ! */
-# endif
 #endif
 
 }