diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-16 14:38:19 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-16 14:38:19 +0000 |
commit | ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8 (patch) | |
tree | 7411f04f6136f52b840696bf791626ae218d7a05 /include/asm-arm/arch-realview/system.h | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-dev-ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8.tar.xz linux-dev-ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8.zip |
[ARM] Fix arch-realview/system.h to use __io_address()
Move __io_address to arch-realview/hardware.h, drop core.h from platsmp.c
and localtimer.c, and include asm/io.h where required.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r-- | include/asm-arm/arch-realview/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-realview/system.h b/include/asm-arm/arch-realview/system.h index 9f8fcbca0869..6f3d0ce0ca1e 100644 --- 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; /* |