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-iplan2p8.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/video/fbcon-iplan2p8.c')
| -rw-r--r-- | drivers/video/fbcon-iplan2p8.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbcon-iplan2p8.c b/drivers/video/fbcon-iplan2p8.c index c730eb39c..411dc5ae9 100644 --- a/drivers/video/fbcon-iplan2p8.c +++ b/drivers/video/fbcon-iplan2p8.c @@ -404,8 +404,8 @@ void fbcon_iplan2p8_putcs(struct vc_data *conp, struct display *p, dest0 = (p->screen_base + yy * bytes * fontheight(p) + (xx>>1)*16 + (xx & 1)); - expand8dl(attr_fgcol(p,*s), &fgx1, &fgx2); - expand8dl(attr_bgcol(p,*s), &bgx1, &bgx2); + expand8dl(attr_fgcol(p,scr_readw(s)), &fgx1, &fgx2); + expand8dl(attr_bgcol(p,scr_readw(s)), &bgx1, &bgx2); eorx1 = fgx1 ^ bgx1; eorx2 = fgx2 ^ bgx2; while (count--) { @@ -417,7 +417,7 @@ void fbcon_iplan2p8_putcs(struct vc_data *conp, struct display *p, * cache :-( */ - c = *s++ & p->charmask; + c = scr_readw(s++) & p->charmask; if (fontheightlog(p)) cdat = p->fontdata + (c << fontheightlog(p)); else |