[parisc-linux-cvs] fix sticon
Richard Hirst
rhirst@linuxcare.com
Tue, 10 Jul 2001 13:55:22 +0100
&sti_con is not the right parameter type for register_console(),
so I reverted this change. Now get sticon output, but keyboard
still dead.
Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- Makefile 2001/07/09 02:33:53 1.90
+++ Makefile 2001/07/10 12:51:53
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 6
-EXTRAVERSION = -pa7
+EXTRAVERSION = -pa8
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: drivers/video/sti/sticon.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticon.c,v
retrieving revision 1.17
diff -u -r1.17 sticon.c
--- sticon.c 2001/07/08 12:41:57 1.17
+++ sticon.c 2001/07/10 12:51:54
@@ -393,7 +393,7 @@
{
printk(KERN_INFO "%s: searching for STI ROMs\n", __FUNCTION__);
if (sti_init_roms()) {
- register_console(&sti_con);
+ take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
return 0;
} else
return -ENODEV;