diff --git a/[refs] b/[refs] index abe5cdffccf5..e8f0c80a814a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d88dc13a2463cac2a909d6b8570b7d47f88f1b6e +refs/heads/master: f6b3df625ab8285398b4acf02942a8e742e72efc diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index 213fbbcf613b..4e292f29bf5d 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -1141,7 +1140,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) */ fb_start = ps3fb_videomemory.address + GPU_FB_START; info->screen_base = (char __force __iomem *)fb_start; - info->fix.smem_start = virt_to_abs(fb_start); + info->fix.smem_start = __pa(fb_start); info->fix.smem_len = ps3fb_videomemory.size - GPU_FB_START; info->pseudo_palette = par->pseudo_palette;