diff --git a/[refs] b/[refs] index 6447670a1460..1cc00cc92e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 +refs/heads/master: 4d2185d93c670902b6e4716b360e2bcb7d2f7b2f diff --git a/trunk/drivers/sh/intc.c b/trunk/drivers/sh/intc.c index 1da1edef2221..3a5a17db9474 100644 --- a/trunk/drivers/sh/intc.c +++ b/trunk/drivers/sh/intc.c @@ -899,8 +899,8 @@ void __init register_intc_controller(struct intc_desc *desc) vect2->enum_id = 0; /* redirect this interrupts to the first one */ + set_irq_chip(irq2, &dummy_irq_chip); set_irq_chained_handler(irq2, intc_redirect_irq); - set_irq_chip(irq2, &d->chip); set_irq_data(irq2, (void *)irq); } }