diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:51:26 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:47:07 -0400 |
commit | ea770789dce2d27afab39c3891a475624acbd82f (patch) | |
tree | 352ed0f19b74bff7dc6b80f7e05e7bf35b1f5d3f /drivers/video/svgalib.c | |
parent | d907ec04cc498e11e039e0fff8eb58cf01e885da (diff) |
svga: Make svga_wcrt_mask() 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index ea7490490de6..3d07287e9322 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c | |||
@@ -130,9 +130,9 @@ void svga_set_default_seq_regs(void __iomem *regbase) | |||
130 | void svga_set_default_crt_regs(void) | 130 | void svga_set_default_crt_regs(void) |
131 | { | 131 | { |
132 | /* Standard CRT registers CR03 CR08 CR09 CR14 CR17 */ | 132 | /* Standard CRT registers CR03 CR08 CR09 CR14 CR17 */ |
133 | svga_wcrt_mask(0x03, 0x80, 0x80); /* Enable vertical retrace EVRA */ | 133 | svga_wcrt_mask(NULL, 0x03, 0x80, 0x80); /* Enable vertical retrace EVRA */ |
134 | vga_wcrt(NULL, VGA_CRTC_PRESET_ROW, 0); | 134 | vga_wcrt(NULL, VGA_CRTC_PRESET_ROW, 0); |
135 | svga_wcrt_mask(VGA_CRTC_MAX_SCAN, 0, 0x1F); | 135 | svga_wcrt_mask(NULL, VGA_CRTC_MAX_SCAN, 0, 0x1F); |
136 | vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0); | 136 | vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0); |
137 | vga_wcrt(NULL, VGA_CRTC_MODE, 0xE3); | 137 | vga_wcrt(NULL, VGA_CRTC_MODE, 0xE3); |
138 | } | 138 | } |
@@ -145,7 +145,7 @@ void svga_set_textmode_vga_regs(void) | |||
145 | 145 | ||
146 | vga_wcrt(NULL, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */ | 146 | vga_wcrt(NULL, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */ |
147 | vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0x1f); | 147 | vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0x1f); |
148 | svga_wcrt_mask(VGA_CRTC_MODE, 0x23, 0x7f); | 148 | svga_wcrt_mask(NULL, VGA_CRTC_MODE, 0x23, 0x7f); |
149 | 149 | ||
150 | vga_wcrt(NULL, VGA_CRTC_CURSOR_START, 0x0d); | 150 | vga_wcrt(NULL, VGA_CRTC_CURSOR_START, 0x0d); |
151 | vga_wcrt(NULL, VGA_CRTC_CURSOR_END, 0x0e); | 151 | vga_wcrt(NULL, VGA_CRTC_CURSOR_END, 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(0x0A, 0x20, 0x20); /* disable cursor */ | 313 | svga_wcrt_mask(NULL, 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; |