Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core

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;
 }