Merge branch 'machtypes' into pxa-palm

[mv-sheeva.git] / arch / parisc / lib / iomap.c

diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index 01bec8fcbd0d180b120cc4995fe8b0aaf5b14025..9abed07db7fc0ded2b7e041c5e73f65e1911b211 100644 (file)
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -263,11 +263,7 @@ static const struct iomap_ops iomem_ops = {
 
 const struct iomap_ops *iomap_ops[8] = {
        [0] = &ioport_ops,
-#ifdef CONFIG_DEBUG_IOREMAP
-       [6] = &iomem_ops,
-#else
        [7] = &iomem_ops
-#endif
 };
 
 
@@ -442,8 +438,8 @@ void ioport_unmap(void __iomem *addr)
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-       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 || !start)