aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/s3fb.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 18:52:11 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 02:47:18 -0400
commit55db092388455457791cf00216b6b3965a8071f8 (patch)
tree753b175ccb2b1667d6412e0b950e3ff5ad3a7198 /drivers/video/s3fb.c
parent9c96394bb90f855d265116f37897294fa1bdb072 (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/s3fb.c')
-rw-r--r--drivers/video/s3fb.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 017219565800..be3802e8108a 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -188,12 +188,19 @@ static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map)
188 } 188 }
189} 189}
190 190
191static void s3fb_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor)
192{
193 struct s3fb_info *par = info->par;
194
195 svga_tilecursor(par->state.vgabase, info, cursor);
196}
197
191static struct fb_tile_ops s3fb_tile_ops = { 198static struct fb_tile_ops s3fb_tile_ops = {
192 .fb_settile = svga_settile, 199 .fb_settile = svga_settile,
193 .fb_tilecopy = svga_tilecopy, 200 .fb_tilecopy = svga_tilecopy,
194 .fb_tilefill = svga_tilefill, 201 .fb_tilefill = svga_tilefill,
195 .fb_tileblit = svga_tileblit, 202 .fb_tileblit = svga_tileblit,
196 .fb_tilecursor = svga_tilecursor, 203 .fb_tilecursor = s3fb_tilecursor,
197 .fb_get_tilemax = svga_get_tilemax, 204 .fb_get_tilemax = svga_get_tilemax,
198}; 205};
199 206
@@ -202,7 +209,7 @@ static struct fb_tile_ops s3fb_fast_tile_ops = {
202 .fb_tilecopy = svga_tilecopy, 209 .fb_tilecopy = svga_tilecopy,
203 .fb_tilefill = svga_tilefill, 210 .fb_tilefill = svga_tilefill,
204 .fb_tileblit = svga_tileblit, 211 .fb_tileblit = svga_tileblit,
205 .fb_tilecursor = svga_tilecursor, 212 .fb_tilecursor = s3fb_tilecursor,
206 .fb_get_tilemax = svga_get_tilemax, 213 .fb_get_tilemax = svga_get_tilemax,
207}; 214};
208 215