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 /arch/arm | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| download | linux-3.10-ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8.tar.gz linux-3.10-ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8.tar.bz2 linux-3.10-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 'arch/arm')
| -rw-r--r-- | arch/arm/mach-realview/core.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-realview/localtimer.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-realview/platsmp.c | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index d83e8bad203..c06e6041df4 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h @@ -26,8 +26,6 @@ #include <asm/leds.h> #include <asm/io.h> -#define __io_address(n) __io(IO_ADDRESS(n)) - extern struct sys_timer realview_timer; #define AMBA_DEVICE(name,busid,base,plat) \ diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c index 5e917e37d09..c9d7c596b20 100644 --- a/arch/arm/mach-realview/localtimer.c +++ b/arch/arm/mach-realview/localtimer.c @@ -21,8 +21,6 @@ #include <asm/io.h> #include <asm/irq.h> -#include "core.h" - #define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \ ((cpu) * REALVIEW_TWD_SIZE)) diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 0c7d4ac9a7b..a8fbd76d8be 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c @@ -17,8 +17,7 @@ #include <asm/cacheflush.h> #include <asm/hardware/arm_scu.h> #include <asm/hardware.h> - -#include "core.h" +#include <asm/io.h> extern void realview_secondary_startup(void); |