summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2010-05-06 18:30:55 +0800
committerWolfgang Denk <wd@denx.de>2010-06-22 22:33:06 +0200
commit95bc39e848dd3f741a064c826d1c282c48125d41 (patch)
treeca34a47b1d65147438944020fab6f5cdc97b3f18 /arch/arm/include/asm
parenta71da1b6c96205549ca2e7cf991e2340181bbfcf (diff)
downloadu-boot-imx-95bc39e848dd3f741a064c826d1c282c48125d41.zip
u-boot-imx-95bc39e848dd3f741a064c826d1c282c48125d41.tar.gz
u-boot-imx-95bc39e848dd3f741a064c826d1c282c48125d41.tar.bz2
ARM: fix bug in macro __arch_ioremap.
Signed-off-by: Terry Lv <r65388@freescale.com> Fix commit message and code formatting. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/include/asm')
-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