Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 2ce75625b417..232e3b9f880d 100644
--- 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;
         }
 }