summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbcon-mac.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/video/fbcon-mac.c
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/video/fbcon-mac.c')
-rw-r--r--drivers/video/fbcon-mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbcon-mac.c b/drivers/video/fbcon-mac.c
index f2508e4cb..2c6486c41 100644
--- a/drivers/video/fbcon-mac.c
+++ b/drivers/video/fbcon-mac.c
@@ -301,7 +301,7 @@ void fbcon_mac_putcs(struct vc_data *conp, struct display *p,
u16 c;
while (count--) {
- c = *s++;
+ c = scr_readw(s++);
fbcon_mac_putc(conp, p, c, yy, xx++);
}
}