Merge branch 'pxa-all' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-davinci / gpio.c

diff --git a/arch/arm/mach-davinci/gpio.c b/arch/arm/mach-davinci/gpio.c
index 9c67886e71895a2cf81f99f31c34403660992dc1..574cb810a500343a921a65647bb3d261a39edc0b 100644 (file)
--- a/arch/arm/mach-davinci/gpio.c
+++ b/arch/arm/mach-davinci/gpio.c
@@ -20,9 +20,9 @@
 #include <linux/irq.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/irqs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
+#include <mach/irqs.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
 
 #include <asm/mach/irq.h>
 
@@ -201,7 +201,6 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
        desc->chip->ack(irq);
        while (1) {
                u32             status;
-               struct irq_desc *gpio;
                int             n;
                int             res;
 
@@ -215,12 +214,10 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 
                /* now demux them to the right lowlevel handler */
                n = (int)get_irq_data(irq);
-               gpio = &irq_desc[n];
                while (status) {
                        res = ffs(status);
                        n += res;
-                       gpio += res;
-                       desc_handle_irq(n - 1, gpio - 1);
+                       generic_handle_irq(n - 1);
                        status >>= res;
                }
        }