diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /arch/m68k/amiga/config.c | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) | |
download | talos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.tar.gz talos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.zip |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'arch/m68k/amiga/config.c')
-rw-r--r-- | arch/m68k/amiga/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index ab9862c3a136..6e562751ad51 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -493,7 +493,8 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) * Please don't change this to use ciaa, as it interferes with the * SCSI code. We'll have to take a look at this later */ - request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL); + if (request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL)) + pr_err("Couldn't register timer interrupt\n"); /* start timer */ ciab.cra |= 0x11; } |