aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/hp300/time.c
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 05:47:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 10:00:57 -0700
commit35353bb8b869f3a0a153d0674cdafbe4f64aaa05 (patch)
tree26b9c36b3ad1d03c810c13bb81e159bdbe782b9f /arch/m68k/hp300/time.c
parent734085651c9b80aa3f9e6027b156102de214a0b2 (diff)
downloadkernel_samsung_smdk4412-35353bb8b869f3a0a153d0674cdafbe4f64aaa05.zip
kernel_samsung_smdk4412-35353bb8b869f3a0a153d0674cdafbe4f64aaa05.tar.gz
kernel_samsung_smdk4412-35353bb8b869f3a0a153d0674cdafbe4f64aaa05.tar.bz2
[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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index 8da5b1b..7df0566 100644
--- a/arch/m68k/hp300/time.c
+++ b/arch/m68k/hp300/time.c
@@ -18,7 +18,6 @@
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/blinken.h>
-#include "ints.h"
/* Clock hardware definitions */
@@ -71,7 +70,7 @@ void __init hp300_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
- cpu_request_irq(6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
+ request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */