diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:52:11 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:47:18 -0400 |
commit | 55db092388455457791cf00216b6b3965a8071f8 (patch) | |
tree | 753b175ccb2b1667d6412e0b950e3ff5ad3a7198 /drivers/video/svgalib.c | |
parent | 9c96394bb90f855d265116f37897294fa1bdb072 (diff) |
svga: Make svga_tilecursor() take an iomem regbase pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/svgalib.c')
-rw-r--r-- | drivers/video/svgalib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index ecda90ec4056..4876be85ecfd 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c | |||
@@ -299,7 +299,7 @@ void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit) | |||
299 | } | 299 | } |
300 | 300 | ||
301 | /* Set cursor in text (tileblit) mode */ | 301 | /* Set cursor in text (tileblit) mode */ |
302 | void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor) | 302 | void svga_tilecursor(void __iomem *regbase, struct fb_info *info, struct fb_tilecursor *cursor) |
303 | { | 303 | { |
304 | u8 cs = 0x0d; | 304 | u8 cs = 0x0d; |
305 | u8 ce = 0x0e; | 305 | u8 ce = 0x0e; |
@@ -310,7 +310,7 @@ void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor) | |||
310 | if (! cursor -> mode) | 310 | if (! cursor -> mode) |
311 | return; | 311 | return; |
312 | 312 | ||
313 | svga_wcrt_mask(NULL, 0x0A, 0x20, 0x20); /* disable cursor */ | 313 | svga_wcrt_mask(regbase, 0x0A, 0x20, 0x20); /* disable cursor */ |
314 | 314 | ||
315 | if (cursor -> shape == FB_TILE_CURSOR_NONE) | 315 | if (cursor -> shape == FB_TILE_CURSOR_NONE) |
316 | return; | 316 | return; |
@@ -334,11 +334,11 @@ void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor) | |||
334 | } | 334 | } |
335 | 335 | ||
336 | /* set cursor position */ | 336 | /* set cursor position */ |
337 | vga_wcrt(NULL, 0x0E, pos >> 8); | 337 | vga_wcrt(regbase, 0x0E, pos >> 8); |
338 | vga_wcrt(NULL, 0x0F, pos & 0xFF); | 338 | vga_wcrt(regbase, 0x0F, pos & 0xFF); |
339 | 339 | ||
340 | vga_wcrt(NULL, 0x0B, ce); /* set cursor end */ | 340 | vga_wcrt(regbase, 0x0B, ce); /* set cursor end */ |
341 | vga_wcrt(NULL, 0x0A, cs); /* set cursor start and enable it */ | 341 | vga_wcrt(regbase, 0x0A, cs); /* set cursor start and enable it */ |
342 | } | 342 | } |
343 | 343 | ||
344 | int svga_get_tilemax(struct fb_info *info) | 344 | int svga_get_tilemax(struct fb_info *info) |