Merge branch 'pxa-all' into devel

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

diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 2ce75625b4173a23e7fb30fc8c7cf5c3dfb29e1b..232e3b9f880db1cf78029078ea816e6bd95ba049 100644 (file)
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -182,14 +182,12 @@ static void
 imx_gpio_handler(unsigned int mask, unsigned int irq,
                  struct irq_desc *desc)
 {
-       desc = irq_desc + irq;
        while (mask) {
                if (mask & 1) {
                        DEBUG_IRQ("handling irq %d\n", irq);
-                       desc_handle_irq(irq, desc);
+                       generic_handle_irq(irq);
                }
                irq++;
-               desc++;
                mask >>= 1;
        }
 }