git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
mach
/
io.h
diff --git
a/arch/arm/plat-omap/include/mach/io.h
b/arch/arm/plat-omap/include/mach/io.h
index
3b28147
..
73f483d
100644
(file)
--- 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))