diff --git a/[refs] b/[refs]
index 00dc4c43c561..00e65b169ad1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92a11f9e7cb876e6cf9080e4a1642142cb9221b2
+refs/heads/master: ba724a373a7184dce869e8adb79a0a03d91fbdd8
diff --git a/trunk/arch/ppc/platforms/4xx/ebony.c b/trunk/arch/ppc/platforms/4xx/ebony.c
index 55120c317f7d..cd11734ef7c5 100644
--- a/trunk/arch/ppc/platforms/4xx/ebony.c
+++ b/trunk/arch/ppc/platforms/4xx/ebony.c
@@ -149,7 +149,7 @@ ebony_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
 static void __init
 ebony_setup_pcix(void)
 {
-	void *pcix_reg_base;
+	void __iomem *pcix_reg_base;
 
 	pcix_reg_base = ioremap64(PCIX0_REG_BASE, PCIX_REG_SIZE);