[IA64] Manual merge fix for 3 files

[linux-2.6] / arch / arm / mach-imx / irq.c

diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 45d22dd5583a8b2ba6c29ec4fd95f4571a6ab7ea..eeb8a6d4a3999c1f9f605588ab0852e0b4b88621 100644 (file)
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -152,7 +152,7 @@ imx_gpio_handler(unsigned int mask, unsigned int irq,
        while (mask) {
                if (mask & 1) {
                        DEBUG_IRQ("handling irq %d\n", irq);
-                       desc->handle(irq, desc, regs);
+                       desc_handle_irq(irq, desc, regs);
                }
                irq++;
                desc++;