diff --git a/[refs] b/[refs]
index d159404e75f3..801b50fd02a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8087ebd5a121ac6bf5a8eba2459c01d3659c3e31
+refs/heads/master: d94bad827d9a0df939a0e7ed081a2780b9f72c4b
diff --git a/trunk/arch/powerpc/sysdev/indirect_pci.c b/trunk/arch/powerpc/sysdev/indirect_pci.c
index b5d068204aa3..cfbd2aae93e8 100644
--- a/trunk/arch/powerpc/sysdev/indirect_pci.c
+++ b/trunk/arch/powerpc/sysdev/indirect_pci.c
@@ -149,9 +149,11 @@ static struct pci_ops indirect_pci_ops =
 };
 
 void __init
-setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data, u32 flags)
+setup_indirect_pci(struct pci_controller* hose,
+		   resource_size_t cfg_addr,
+		   resource_size_t cfg_data, u32 flags)
 {
-	unsigned long base = cfg_addr & PAGE_MASK;
+	resource_size_t base = cfg_addr & PAGE_MASK;
 	void __iomem *mbase;
 
 	mbase = ioremap(base, PAGE_SIZE);
diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h
index e909769b6410..dc318458b5fe 100644
--- a/trunk/include/asm-powerpc/pci-bridge.h
+++ b/trunk/include/asm-powerpc/pci-bridge.h
@@ -98,7 +98,8 @@ extern int early_find_capability(struct pci_controller *hose, int bus,
 				 int dev_fn, int cap);
 
 extern void setup_indirect_pci(struct pci_controller* hose,
-			       u32 cfg_addr, u32 cfg_data, u32 flags);
+			       resource_size_t cfg_addr,
+			       resource_size_t cfg_data, u32 flags);
 extern void setup_grackle(struct pci_controller *hose);
 extern void __init update_bridge_resource(struct pci_dev *dev,
 					  struct resource *res);