Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / video / fbdev / ps3fb.c

diff --git a/drivers/video/fbdev/ps3fb.c b/drivers/video/fbdev/ps3fb.c
index 98aaa330a193dcc318aab6510416c2147361630c..d4abcf8aff75fb9c7690981bcdab6925dc382890 100644 (file)
--- a/drivers/video/fbdev/ps3fb.c
+++ b/drivers/video/fbdev/ps3fb.c
@@ -650,7 +650,7 @@ static int ps3fb_set_par(struct fb_info *info)
        }
 
        /* Clear XDR frame buffer memory */
-       memset((void __force *)info->screen_base, 0, info->fix.smem_len);
+       memset(info->screen_buffer, 0, info->fix.smem_len);
 
        /* Clear DDR frame buffer memory */
        lines = vmode->yres * par->num_frames;
@@ -1140,7 +1140,7 @@ static int ps3fb_probe(struct ps3_system_bus_device *dev)
         * memory
         */
        fb_start = ps3fb_videomemory.address + GPU_FB_START;
-       info->screen_base = (char __force __iomem *)fb_start;
+       info->screen_buffer = fb_start;
        info->fix.smem_start = __pa(fb_start);
        info->fix.smem_len = ps3fb_videomemory.size - GPU_FB_START;