|
@@ -1498,7 +1498,7 @@ static int __devinit savage_map_mmio (struct fb_info *info)
|
|
info->fix.mmio_start = par->mmio.pbase;
|
|
info->fix.mmio_start = par->mmio.pbase;
|
|
info->fix.mmio_len = par->mmio.len;
|
|
info->fix.mmio_len = par->mmio.len;
|
|
|
|
|
|
- par->bci_base = (u32*)(par->mmio.vbase + BCI_BUFFER_OFFSET);
|
|
|
|
|
|
+ par->bci_base = (u32 __iomem *)(par->mmio.vbase + BCI_BUFFER_OFFSET);
|
|
par->bci_ptr = 0;
|
|
par->bci_ptr = 0;
|
|
|
|
|
|
savage_enable_mmio (par);
|
|
savage_enable_mmio (par);
|
|
@@ -1514,7 +1514,7 @@ static void __devinit savage_unmap_mmio (struct fb_info *info)
|
|
savage_disable_mmio(par);
|
|
savage_disable_mmio(par);
|
|
|
|
|
|
if (par->mmio.vbase) {
|
|
if (par->mmio.vbase) {
|
|
- iounmap ((void *)par->mmio.vbase);
|
|
|
|
|
|
+ iounmap(par->mmio.vbase);
|
|
par->mmio.vbase = NULL;
|
|
par->mmio.vbase = NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1553,7 +1553,7 @@ static int __devinit savage_map_video (struct fb_info *info,
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/* Clear framebuffer, it's all white in memory after boot */
|
|
/* Clear framebuffer, it's all white in memory after boot */
|
|
- memset (par->video.vbase, 0, par->video.len);
|
|
|
|
|
|
+ memset_io (par->video.vbase, 0, par->video.len);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|