From 86dea9e38a66e83547b6be048c6fd07b37458711 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 23 Jun 2009 16:55:30 +0300 Subject: [PATCH] --- yaml --- r: 154551 b: refs/heads/master c: 503dcbeba50fd3545283594bc391b4a400fa6c48 h: refs/heads/master i: 154549: 3abe3b88d98159889c7da71a51037fa296a7778f 154547: 944782c15331c64ef0eaf51cb2977c16e005761c 154543: e55a05e1e7bbff6cb31cb9fa1cee5564b1e999bc v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/mach/io.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2f7314a9d5f..319424a9a7a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb5793db5ecf108594d8006ae838e47996a76a19 +refs/heads/master: 503dcbeba50fd3545283594bc391b4a400fa6c48 diff --git a/trunk/arch/arm/plat-omap/include/mach/io.h b/trunk/arch/arm/plat-omap/include/mach/io.h index 3b2814720569..73f483d56ca6 100644 --- a/trunk/arch/arm/plat-omap/include/mach/io.h +++ b/trunk/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))