projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[powerpc.git]
/
include
/
asm-arm
/
arch-realview
/
system.h
diff --git
a/include/asm-arm/arch-realview/system.h
b/include/asm-arm/arch-realview/system.h
index
9f8fcbc
..
6f3d0ce
100644
(file)
--- a/
include/asm-arm/arch-realview/system.h
+++ b/
include/asm-arm/arch-realview/system.h
@@
-36,7
+36,7
@@
static inline void arch_idle(void)
static inline void arch_reset(char mode)
{
-
unsigned int hdr_ctrl = (IO_ADDRESS(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET)
;
+
void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET
;
unsigned int val;
/*