Merge branch 'late/fixes' into fixes

[karo-tx-linux.git] / arch / x86 / kernel / probe_roms.c

diff --git a/arch/x86/kernel/probe_roms.c b/arch/x86/kernel/probe_roms.c
index 0bc72e2069e326b8c1d3a2e99213861621d9458c..d5f15c3f7b25e11996bcaf41826d46fc4645bc8f 100644 (file)
--- a/arch/x86/kernel/probe_roms.c
+++ b/arch/x86/kernel/probe_roms.c
@@ -150,7 +150,7 @@ static struct resource *find_oprom(struct pci_dev *pdev)
        return oprom;
 }
 
-void *pci_map_biosrom(struct pci_dev *pdev)
+void __iomem *pci_map_biosrom(struct pci_dev *pdev)
 {
        struct resource *oprom = find_oprom(pdev);