Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6

[linux-2.6] / kernel / irq / handle.c

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 06b5a6323998957a268da66eb096b94fec5154ec..436c7d93c00a9555f245da72ce9efced1bffd47b 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -119,8 +119,6 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
                 */
                desc->handler->ack(irq);
                action_ret = handle_IRQ_event(irq, regs, desc->action);
-               if (!noirqdebug)
-                       note_interrupt(irq, desc, action_ret);
                desc->handler->end(irq);
                return 1;
        }