X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Foffb.c;h=42a6591e863f8af3c3d52ead6f4d3e94f1efe801;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=f5a776364c72b025b7b0eea4825fa3f049d5a750;hpb=e3f6fb6212a7102bdb56ba38fa1e98fe72950475;p=linux-2.6.git

diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index f5a776364..42a6591e8 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -29,6 +29,10 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 
+#ifdef CONFIG_PPC64
+#include <asm/pci-bridge.h>
+#endif
+
 #ifdef CONFIG_PPC32
 #include <asm/bootx.h>
 #endif
@@ -322,7 +326,8 @@ static void __init offb_init_nodriver(struct device_node *dp)
 	int *pp, i;
 	unsigned int len;
 	int width = 640, height = 480, depth = 8, pitch;
-	unsigned *up, address;
+	unsigned *up;
+	unsigned long address;
 
 	if ((pp = (int *) get_property(dp, "depth", &len)) != NULL
 	    && len == sizeof(int))
@@ -357,6 +362,10 @@ static void __init offb_init_nodriver(struct device_node *dp)
 
 		address = (u_long) dp->addrs[i].address;
 
+#ifdef CONFIG_PPC64
+		address += dp->phb->pci_mem_offset;
+#endif
+
 		/* kludge for valkyrie */
 		if (strcmp(dp->name, "valkyrie") == 0)
 			address += 0x1000;