Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / ia64 / kernel / irq_ia64.c

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 9a26015c3e50027d7cb88981881971feb3d88bc0..38c07b8669011dad6e5637c4049d9d959e61bf5c 100644 (file)
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -633,7 +633,7 @@ ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
        BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL));
        desc = irq_desc + irq;
        desc->status |= IRQ_PER_CPU;
-       desc->chip = &irq_type_ia64_lsapic;
+       set_irq_chip(irq, &irq_type_ia64_lsapic);
        if (action)
                setup_irq(irq, action);
        set_irq_handler(irq, handle_percpu_irq);