Merge tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / m68k / kernel / ints.c

diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 6b32b64bac35ffb7022d1a1cebcd7b971fc2fd3e..4d7da384eea03d5a1101859a5814c7dccce53a9e 100644 (file)
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -101,7 +101,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt)
        BUG_ON(IRQ_USER + cnt > NR_IRQS);
        m68k_first_user_vec = vec;
        for (i = 0; i < cnt; i++)
-               irq_set_chip(IRQ_USER + i, &user_irq_chip);
+               irq_set_chip_and_handler(i, &user_irq_chip, handle_simple_irq);
        *user_irqvec_fixup = vec - IRQ_USER;
        flush_icache();
 }