From 929d2247e2ad8f5b875818c5ec2f893e940c5341 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 25 Jul 2012 21:19:59 +0000
Subject: [PATCH] --- yaml --- r: 330245 b: refs/heads/master c:
 f6b3df625ab8285398b4acf02942a8e742e72efc h: refs/heads/master i:   330243:
 26104f96d988e5103a6b5d38a6487a1b209b241b v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/ps3fb.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 <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>
@@ -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;