iommu/rockchip: add multi irq support

[firefly-linux-kernel-4.4.55.git] / include / asm-generic / iomap.h

diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
index e72c4510a7e10879c117339d1c02b8cd1ce632ea..d8f8622fa044dbaeba223bc373f57dad5dac6070 100644 (file)
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h
@@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun
 extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
 extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
 
-#ifdef CONFIG_HAS_IOPORT
+#ifdef CONFIG_HAS_IOPORT_MAP
 /* Create a virtual mapping cookie for an IO port range */
 extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
 extern void ioport_unmap(void __iomem *);
@@ -66,9 +66,8 @@ extern void ioport_unmap(void __iomem *);
 #define ioremap_wc ioremap_nocache
 #endif
 
-#ifndef ARCH_HAS_IOREMAP_EXEC
-#define ioremap_exec ioremap
-#define ioremap_exec_nocache ioremap_nocache
+#ifndef ARCH_HAS_IOREMAP_WT
+#define ioremap_wt ioremap_nocache
 #endif
 
 #ifdef CONFIG_PCI