diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/video/fbcon-iplan2p2.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/video/fbcon-iplan2p2.c')
| -rw-r--r-- | drivers/video/fbcon-iplan2p2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbcon-iplan2p2.c b/drivers/video/fbcon-iplan2p2.c index 0c0bfa21f..0dfdc6107 100644 --- a/drivers/video/fbcon-iplan2p2.c +++ b/drivers/video/fbcon-iplan2p2.c @@ -361,12 +361,12 @@ void fbcon_iplan2p2_putcs(struct vc_data *conp, struct display *p, else dest0 = (p->screen_base + yy * bytes * fontheight(p) + (xx>>1)*4 + (xx & 1)); - fgx = expand2w(COLOR_2P(attr_fgcol(p,*s))); - bgx = expand2w(COLOR_2P(attr_bgcol(p,*s))); + fgx = expand2w(COLOR_2P(attr_fgcol(p,scr_readw(s)))); + bgx = expand2w(COLOR_2P(attr_bgcol(p,scr_readw(s)))); eorx = fgx ^ bgx; while (count--) { - c = *s++ & p->charmask; + c = scr_readw(s++) & p->charmask; if (fontheightlog(p)) cdat = p->fontdata + (c << fontheightlog(p)); else |