diff --git a/[refs] b/[refs] index 2a6357defccf..02b11a4676a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da4f4a02abebb8b6f49e1585acbb23921a5da410 +refs/heads/master: 454dc5f8228d08e6e9876c45d7f9bfd8b745e39d diff --git a/trunk/arch/m68knommu/kernel/irq.c b/trunk/arch/m68knommu/kernel/irq.c index bba1bb48a21f..56e0f4c55a67 100644 --- a/trunk/arch/m68knommu/kernel/irq.c +++ b/trunk/arch/m68knommu/kernel/irq.c @@ -23,7 +23,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) struct pt_regs *oldregs = set_irq_regs(regs); irq_enter(); - __do_IRQ(irq); + generic_handle_irq(irq); irq_exit(); set_irq_regs(oldregs);