vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / i810 / i810_gtf.c

diff --git a/drivers/video/i810/i810_gtf.c b/drivers/video/i810/i810_gtf.c
index b18689b..814698b 100644 (file)
--- a/drivers/video/i810/i810_gtf.c
+++ b/drivers/video/i810/i810_gtf.c
@@ -124,7 +124,8 @@ void i810fb_encode_registers(const struct fb_var_screeninfo *var,
                             struct i810fb_par *par, u32 xres, u32 yres)
 {
        int n, blank_s, blank_e;
-       u8 *mmio = par->mmio_start_virtual, msr = 0;
+       u8 __iomem *mmio = par->mmio_start_virtual;
+       u8 msr = 0;
 
        /* Horizontal */
        /* htotal */
@@ -222,7 +223,7 @@ void i810fb_fill_var_timings(struct fb_var_screeninfo *var) { }
 u32 i810_get_watermark(const struct fb_var_screeninfo *var,
                       struct i810fb_par *par)
 {
-       struct wm_info *wmark = 0;
+       struct wm_info *wmark = NULL;
        u32 i, size = 0, pixclock, wm_best = 0, min, diff;
 
        if (par->mem_freq == 100) {