patch-2.1.107 linux/drivers/macintosh/pmac-cons.c

• Lines: 37
• Date: Wed Jun 24 14:44:01 1998
• Orig file: v2.1.106/linux/drivers/macintosh/pmac-cons.c
• Orig date: Fri May 8 23:14:47 1998

diff -u --recursive --new-file v2.1.106/linux/drivers/macintosh/pmac-cons.c linux/drivers/macintosh/pmac-cons.c
@@ -12,9 +12,9 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/string.h>
-#include <linux/vc_ioctl.h>
 #include <linux/kd.h>
 #include <linux/version.h>
+#include <asm/vc_ioctl.h>
 #include <asm/processor.h>
 #include <asm/prom.h>
 #include <asm/pgtable.h>
@@ -40,6 +40,7 @@
 #ifdef CONFIG_IMSTT_VIDEO
 #include "imstt.h"
 #endif
+#include <linux/console_compat.h>
 
 int video_mode = VMODE_NVRAM;
 int color_mode = CMODE_NVRAM;
@@ -320,7 +321,7 @@
 		hide_cursor();
 	} else {
 		old_cursor = cursor_pos;
-		cursor_pos = (pos - video_mem_base) >> 1;
+		cursor_pos = (pos - video_mem_start) >> 1;
 		if (old_cursor != -1)
 			invert_cursor(-1);
 		invert_cursor(cursor_pos);
@@ -394,7 +395,7 @@
 }
 
 int
-set_get_font(char *p, int set, int ch512)
+set_get_font(unsigned char *p, int set, int ch512)
 {
 	return 0;
 }