Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / plat-mxc / tzic.c

diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index c299152..57f9395 100644 (file)
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -167,8 +167,8 @@ void __init tzic_init_irq(void __iomem *irqbase)
        /* all IRQ no FIQ Warning :: No selection */
 
        for (i = 0; i < MXC_INTERNAL_IRQS; i++) {
-               irq_set_chip(i, &mxc_tzic_chip.base);
-               irq_set_handler(i, handle_level_irq);
+               irq_set_chip_and_handler(i, &mxc_tzic_chip.base,
+                                        handle_level_irq);
                set_irq_flags(i, IRQF_VALID);
        }