aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-12-04 12:28:19 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-12-04 12:28:19 +0000
commitbcaa9714a357637e01f0aef65ff28df2fb109b1e (patch)
tree690a0df2a81e75e22e76610cf94a8728efabe0c4
parent5634dbe9f9afaf1faf7cd15602d584be61725785 (diff)
downloadleg-kernel-bcaa9714a357637e01f0aef65ff28df2fb109b1e.tar.gz
fix merge error in arch/arm/include/asm/io.hleg-20131204.0
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--arch/arm/include/asm/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 826cd88fd798..3b6f531c2dc3 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -328,7 +328,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
*/
#define ioremap(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE)
#define ioremap_nocache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE)
-#define ioremap_cached(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED)
+#define ioremap_cache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED)
#define ioremap_wc(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_WC)
#define iounmap __arm_iounmap