From: Tony Lindgren Date: Tue, 23 Jun 2009 13:55:30 +0000 (+0300) Subject: OMAP: Fix IOMEM macro for assembly X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=503dcbeba50fd3545283594bc391b4a400fa6c48;p=linux.git OMAP: Fix IOMEM macro for assembly Otherwise IOMEM calculations can fail. Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index 3b28147205691..73f483d56ca6a 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h @@ -201,7 +201,7 @@ #define OMAP2_IO_ADDRESS(pa) IOMEM(__OMAP2_IO_ADDRESS(pa)) #ifdef __ASSEMBLER__ -#define IOMEM(x) x +#define IOMEM(x) (x) #else #define IOMEM(x) ((void __force __iomem *)(x))