diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2007-11-21 23:27:52 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:55 +0900 |
| commit | b4eaa1cc7ce8203ac9af9184c49c635ce79592b1 (patch) | |
| tree | 83d71382fed9cc992cd6a1c23e6ec28fef304f2a /arch/sh/kernel/time_64.c | |
| parent | sh: Get the mach-cayman IRQ support building. (diff) | |
| download | linux-dev-b4eaa1cc7ce8203ac9af9184c49c635ce79592b1.tar.xz linux-dev-b4eaa1cc7ce8203ac9af9184c49c635ce79592b1.zip | |
sh: Kill off the rest of arch/sh64/kernel/.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/sh/kernel/time_64.c (renamed from arch/sh64/kernel/time.c) | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh/kernel/time_64.c index d1a9b5b078bd..4c52feead115 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh/kernel/time_64.c @@ -31,14 +31,14 @@ #include <linux/bcd.h> #include <linux/timex.h> #include <linux/irq.h> +#include <linux/io.h> #include <linux/platform_device.h> -#include <asm/registers.h> /* required by inline __asm__ stmt. */ +#include <asm/cpu/registers.h> /* required by inline __asm__ stmt. */ +#include <asm/cpu/irq.h> +#include <asm/addrspace.h> #include <asm/processor.h> #include <asm/uaccess.h> -#include <asm/io.h> -#include <asm/irq.h> #include <asm/delay.h> -#include <asm/hardware.h> #define TMU_TOCR_INIT 0x00 #define TMU0_TCR_INIT 0x0020 @@ -240,11 +240,8 @@ static inline void do_timer_interrupt(void) profile_tick(CPU_PROFILING); #ifdef CONFIG_HEARTBEAT - { - extern void heartbeat(void); - - heartbeat(); - } + if (sh_mv.mv_heartbeat != NULL) + sh_mv.mv_heartbeat(); #endif /* |