diff --git a/[refs] b/[refs]
index b5a80b0f82bd..f770d793875a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ff8fef4eaf252ee13a2d0b175a8c876415bd62a
+refs/heads/master: 04d695a6828bca54d53305246545cd1f8a841ac6
diff --git a/trunk/arch/x86/kernel/probe_roms.c b/trunk/arch/x86/kernel/probe_roms.c
index 0bc72e2069e3..d5f15c3f7b25 100644
--- a/trunk/arch/x86/kernel/probe_roms.c
+++ b/trunk/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);