diff options
Diffstat (limited to 'arch/m68k/mvme147/config.c')
-rw-r--r-- | arch/m68k/mvme147/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index 43cdf476ffab..100baaa692a1 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c | |||
@@ -42,7 +42,6 @@ extern unsigned long mvme147_gettimeoffset (void); | |||
42 | extern int mvme147_hwclk (int, struct rtc_time *); | 42 | extern int mvme147_hwclk (int, struct rtc_time *); |
43 | extern int mvme147_set_clock_mmss (unsigned long); | 43 | extern int mvme147_set_clock_mmss (unsigned long); |
44 | extern void mvme147_reset (void); | 44 | extern void mvme147_reset (void); |
45 | extern void mvme147_waitbut(void); | ||
46 | 45 | ||
47 | 46 | ||
48 | static int bcd2int (unsigned char b); | 47 | static int bcd2int (unsigned char b); |
@@ -115,8 +114,9 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id) | |||
115 | void mvme147_sched_init (irq_handler_t timer_routine) | 114 | void mvme147_sched_init (irq_handler_t timer_routine) |
116 | { | 115 | { |
117 | tick_handler = timer_routine; | 116 | tick_handler = timer_routine; |
118 | request_irq (PCC_IRQ_TIMER1, mvme147_timer_int, | 117 | if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQ_FLG_REPLACE, |
119 | IRQ_FLG_REPLACE, "timer 1", NULL); | 118 | "timer 1", NULL)) |
119 | pr_err("Couldn't register timer interrupt\n"); | ||
120 | 120 | ||
121 | /* Init the clock with a value */ | 121 | /* Init the clock with a value */ |
122 | /* our clock goes off every 6.25us */ | 122 | /* our clock goes off every 6.25us */ |