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 branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-at91/include/mach/io.h
b/arch/arm/mach-at91/include/mach/io.h
index
1611bd0
..
0b0cccc
100644
(file)
--- a/
arch/arm/mach-at91/include/mach/io.h
+++ b/
arch/arm/mach-at91/include/mach/io.h
@@
-23,8
+23,8
@@
#define IO_SPACE_LIMIT 0xFFFFFFFF
-#define __io(a)
((void __iomem *)(a)
)
-#define __mem_pci(a)
(a)
+#define __io(a)
__typesafe_io(a
)
+#define __mem_pci(a) (a)
#ifndef __ASSEMBLY__