diff --git a/[refs] b/[refs] index cd9b34acc704..be5070cb1913 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 175fc484256e9c85e043f599ec2f6bc0d2e6c443 +refs/heads/master: 88ffc3505988196ef5cfdc0278ad89025c2a7b1a diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c index c38272746887..5bfeaed7e487 100644 --- a/trunk/kernel/irq/resend.c +++ b/trunk/kernel/irq/resend.c @@ -62,15 +62,6 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) */ desc->chip->enable(irq); - /* - * Temporary hack to figure out more about the problem, which - * is causing the ancient network cards to die. - */ - if (desc->handle_irq != handle_edge_irq) { - WARN_ON_ONCE(1); - return; - } - if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;