Merge tag 'v4.2-rc8' into x86/mm, before applying new changes

[linux-drm-fsl-dcu.git] / arch / m68k / include / asm / io_mm.h

diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index f55cad529400f65eb38832cce8c96760a44f1aad..c98ac81582ac5c967d7bddb04ae6325bc230f8b1 100644 (file)
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -468,6 +468,7 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned lon
 {
        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
 }
+#define ioremap_uc ioremap_nocache
 static inline void __iomem *ioremap_wt(unsigned long physaddr,
                                         unsigned long size)
 {