diff --git a/[refs] b/[refs]
index c1f79fe236b9..4829859b662b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f56cf1c58c81f7ecf16f5e99ac4a333d9dc9aea
+refs/heads/master: 1526a756fba5b1f2eb5001b8e8de2a0ea1bd2c66
diff --git a/trunk/include/asm-generic/iomap.h b/trunk/include/asm-generic/iomap.h
index 67dc84cd1343..76b0cc5637f8 100644
--- a/trunk/include/asm-generic/iomap.h
+++ b/trunk/include/asm-generic/iomap.h
@@ -60,6 +60,10 @@ extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long cou
 extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
 extern void ioport_unmap(void __iomem *);
 
+#ifndef ARCH_HAS_IOREMAP_WC
+#define ioremap_wc ioremap_nocache
+#endif
+
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 struct pci_dev;
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);