Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8

[firefly-linux-kernel-4.4.55.git] / drivers / video / ps3fb.c

diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 26d321dbb5bf6c2ec2f222f2770682e9cc3166e0..0b340d6ff8a4cab05eb4843f5d5ecff38700fbf9 100644 (file)
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -31,7 +31,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 
-#include <asm/abs_addr.h>
 #include <asm/cell-regs.h>
 #include <asm/lv1call.h>
 #include <asm/ps3av.h>
@@ -1146,7 +1145,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;