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

[mv-sheeva.git] / arch / arm / plat-stmp3xxx / irq.c

diff --git a/arch/arm/plat-stmp3xxx/irq.c b/arch/arm/plat-stmp3xxx/irq.c
index 20de4e0401efd68034b8bbd324ca54897d15f1cb..aaa168683d4e5734a24485a5807f4f8871a720c0 100644 (file)
--- a/arch/arm/plat-stmp3xxx/irq.c
+++ b/arch/arm/plat-stmp3xxx/irq.c
@@ -34,7 +34,7 @@ void __init stmp3xxx_init_irq(struct irq_chip *chip)
 
        /* Disable all interrupts initially */
        for (i = 0; i < NR_REAL_IRQS; i++) {
-               chip->mask(i);
+               chip->irq_mask(irq_get_irq_data(i));
                set_irq_chip(i, chip);
                set_irq_handler(i, handle_level_irq);
                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);