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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mx27.h
diff --git
a/arch/arm/plat-mxc/include/mach/mx27.h
b/arch/arm/plat-mxc/include/mach/mx27.h
index
212ecc2
..
a86db64
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mx27.h
+++ b/
arch/arm/plat-mxc/include/mach/mx27.h
@@
-128,6
+128,7
@@
* it returns 0xDEADBEEF
*/
#define IO_ADDRESS(x) \
+ (void __iomem *) \
(((x >= AIPI_BASE_ADDR) && (x < (AIPI_BASE_ADDR + AIPI_SIZE))) ? \
AIPI_IO_ADDRESS(x) : \
((x >= SAHB1_BASE_ADDR) && (x < (SAHB1_BASE_ADDR + SAHB1_SIZE))) ? \