diff options
Diffstat (limited to 'drivers/video/s3fb.c')
-rw-r--r-- | drivers/video/s3fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index c348813e6132..f3470bb7d549 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c | |||
@@ -164,7 +164,7 @@ MODULE_PARM_DESC(fasttext, "Enable S3 fast text mode (1=enable, 0=disable, defau | |||
164 | static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map) | 164 | static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map) |
165 | { | 165 | { |
166 | const u8 *font = map->data; | 166 | const u8 *font = map->data; |
167 | u8* fb = (u8 *) info->screen_base; | 167 | u8 __iomem *fb = (u8 __iomem *) info->screen_base; |
168 | int i, c; | 168 | int i, c; |
169 | 169 | ||
170 | if ((map->width != 8) || (map->height != 16) || | 170 | if ((map->width != 8) || (map->height != 16) || |
@@ -177,7 +177,7 @@ static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map) | |||
177 | fb += 2; | 177 | fb += 2; |
178 | for (i = 0; i < map->height; i++) { | 178 | for (i = 0; i < map->height; i++) { |
179 | for (c = 0; c < map->length; c++) { | 179 | for (c = 0; c < map->length; c++) { |
180 | fb[c * 4] = font[c * map->height + i]; | 180 | fb_writeb(font[c * map->height + i], fb + c * 4); |
181 | } | 181 | } |
182 | fb += 1024; | 182 | fb += 1024; |
183 | } | 183 | } |
@@ -656,7 +656,7 @@ static int s3fb_set_par(struct fb_info *info) | |||
656 | value = ((value * hmul) / 8) - 5; | 656 | value = ((value * hmul) / 8) - 5; |
657 | vga_wcrt(NULL, 0x3C, (value + 1) / 2); | 657 | vga_wcrt(NULL, 0x3C, (value + 1) / 2); |
658 | 658 | ||
659 | memset((u8*)info->screen_base, 0x00, screen_size); | 659 | memset_io(info->screen_base, 0x00, screen_size); |
660 | /* Device and screen back on */ | 660 | /* Device and screen back on */ |
661 | svga_wcrt_mask(0x17, 0x80, 0x80); | 661 | svga_wcrt_mask(0x17, 0x80, 0x80); |
662 | svga_wseq_mask(0x01, 0x00, 0x20); | 662 | svga_wseq_mask(0x01, 0x00, 0x20); |