summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>1999-02-11 23:50:31 +0000
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>1999-02-11 23:50:31 +0000
commit57f4ca34859ba44984f58a061d6269d365175bcc (patch)
tree40235f821f0faf864068632ae94da3a372c81864
parent723a7e6b2643366aa871ed7dd3fd1afcfc8e4415 (diff)
added dummy console, when there is no newport configured
added call to init_vino for non module vino version
-rw-r--r--arch/mips/sgi/kernel/setup.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c
index 53c1879c1..8620e0f46 100644
--- a/arch/mips/sgi/kernel/setup.c
+++ b/arch/mips/sgi/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.18 1999/01/27 04:50:28 adevries Exp $
+/* $Id: setup.c,v 1.19 1999/02/09 22:54:10 adevries Exp $
*
* setup.c: SGI specific setup, including init of the feature struct.
*
@@ -153,6 +153,8 @@ __initfunc(void sgi_setup(void))
#ifdef CONFIG_VT
#ifdef CONFIG_SGI_NEWPORT_CONSOLE
conswitchp = &newport_con;
+#else
+ conswitchp = &dummy_con;
#endif
#endif
rtc_ops = &indy_rtc_ops;
@@ -164,4 +166,7 @@ __initfunc(void sgi_setup(void))
#ifdef CONFIG_SGI_HAL2
sgiaudio_init();
#endif
+#ifdef CONFIG_VIDEO_VINO
+ init_vino();
+#endif
}