summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-23 21:17:29 +0200
committerWolfgang Denk <wd@denx.de>2010-06-23 21:17:29 +0200
commitf35f3968c21bc8d01958ad1f92fe30e6ccc9c318 (patch)
tree2d10d82ec489f225d58b185cf463a4f62ad45ed3 /arch/arm/include
parent54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (diff)
parent482126e27b3dbf0e69a6445da8b94b3551adf05d (diff)
downloadu-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.zip
u-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.gz
u-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.bz2
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/io.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 0a4b5be..e8f3eb1 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -248,13 +248,13 @@ extern void __iounmap(void *addr);
* iomem_to_phys(off)
*/
#ifdef iomem_valid_addr
-#define __arch_ioremap(off,sz,nocache) \
- ({ \
- unsigned long _off = (off), _size = (sz); \
- void *_ret = (void *)0; \
- if (iomem_valid_addr(_off, _size)) \
- _ret = __ioremap(iomem_to_phys(_off),_size,0); \
- _ret; \
+#define __arch_ioremap(off,sz,nocache) \
+ ({ \
+ unsigned long _off = (off), _size = (sz); \
+ void *_ret = (void *)0; \
+ if (iomem_valid_addr(_off, _size)) \
+ _ret = __ioremap(iomem_to_phys(_off),_size,nocache); \
+ _ret; \
})
#define __arch_iounmap __iounmap