diff --git a/[refs] b/[refs]
index 40dac3f4b264..218720c45fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a474fff4f6a5fc14ac493c48f56a14e65912cc7
+refs/heads/master: 472b5b43bec45e7e79f86094ca9091bd9eb474ed
diff --git a/trunk/arch/powerpc/kernel/iomap.c b/trunk/arch/powerpc/kernel/iomap.c
index 2a5cf8680370..1577434f4088 100644
--- a/trunk/arch/powerpc/kernel/iomap.c
+++ b/trunk/arch/powerpc/kernel/iomap.c
@@ -119,8 +119,8 @@ EXPORT_SYMBOL(ioport_unmap);
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
-	unsigned long start = pci_resource_start(dev, bar);
-	unsigned long len = pci_resource_len(dev, bar);
+	resource_size_t start = pci_resource_start(dev, bar);
+	resource_size_t len = pci_resource_len(dev, bar);
 	unsigned long flags = pci_resource_flags(dev, bar);
 
 	if (!len)