[parisc-linux-cvs] -pa10, fix sticon and stifb again

[Helge Deller]

Index: sticon.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticon.c,v
retrieving revision 1.18
diff -u -r1.18 sticon.c
--- sticon.c    2001/07/10 12:55:16     1.18
+++ sticon.c    2001/07/10 16:47:38
@@ -393,7 +393,8 @@
 {
     printk(KERN_INFO "%s: searching for STI ROMs\n", __FUNCTION__);
     if (sti_init_roms()) {
-       take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
+       if (conswitchp == &dummy_con)
+               take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
        return 0;
     } else
        return -ENODEV;