diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 08:47:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:57 -0400 |
| commit | 35353bb8b869f3a0a153d0674cdafbe4f64aaa05 (patch) | |
| tree | 26b9c36b3ad1d03c810c13bb81e159bdbe782b9f /arch/m68k/hp300/time.c | |
| parent | 734085651c9b80aa3f9e6027b156102de214a0b2 (diff) | |
[PATCH] m68k: convert hp300 irq code
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/hp300/time.c')
| -rw-r--r-- | arch/m68k/hp300/time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c index 8da5b1b31e61..7df05662b277 100644 --- a/arch/m68k/hp300/time.c +++ b/arch/m68k/hp300/time.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 19 | #include <asm/traps.h> | 19 | #include <asm/traps.h> |
| 20 | #include <asm/blinken.h> | 20 | #include <asm/blinken.h> |
| 21 | #include "ints.h" | ||
| 22 | 21 | ||
| 23 | /* Clock hardware definitions */ | 22 | /* Clock hardware definitions */ |
| 24 | 23 | ||
| @@ -71,7 +70,7 @@ void __init hp300_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs * | |||
| 71 | 70 | ||
| 72 | asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE)); | 71 | asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE)); |
| 73 | 72 | ||
| 74 | cpu_request_irq(6, hp300_tick, IRQ_FLG_STD, "timer tick", vector); | 73 | request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector); |
| 75 | 74 | ||
| 76 | out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */ | 75 | out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */ |
| 77 | out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */ | 76 | out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */ |