Merge branch 'linux-2.6' into merge

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/iomap.c b/lib/iomap.c
index db004a9ff509..dd6ca48fe6b0 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioport_unmap);
  * */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
         unsigned long len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);