diff --git a/[refs] b/[refs]
index bea8a9cedc6f..16995b8b9276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8405b044e5238afebd7248d927c1d261d2239767
+refs/heads/master: fea80311a939a746533a6d7e7c3183729d6a3faf
diff --git a/trunk/include/asm-generic/iomap.h b/trunk/include/asm-generic/iomap.h
index c74ef2c6e633..98dcd76ce836 100644
--- a/trunk/include/asm-generic/iomap.h
+++ b/trunk/include/asm-generic/iomap.h
@@ -71,6 +71,14 @@ extern void ioport_unmap(void __iomem *);
 struct pci_dev;
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+#else
+struct pci_dev;
+static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
+{
+	return NULL;
+}
+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{ }
 #endif
 
 #endif