Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86...

[linux-2.6-omap-h63xx.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9194adf82e2063eeb1d04cee920e54c2485f2679..03b0b8c3c81b5858282004b60ba9a0893d39a6b5 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1142,7 +1142,7 @@ static inline void pci_mmcfg_late_init(void) { }
 #endif
 
 #ifdef CONFIG_HAS_IOMEM
-static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
+static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
 {
        /*
         * Make sure the BAR is actually a memory resource, not an IO resource