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, 4 deletions

diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
index a22a608a7aba..b45bb3b802f1 100644
--- a/arch/arm/mach-ns9xxx/board-a9m9750dev.c
+++ b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
@@ -86,13 +86,10 @@ static void a9m9750dev_fpga_demux_handler(unsigned int irq,
 
         while (stat != 0) {
                 int irqno = fls(stat) - 1;
-                struct irq_desc *fpgadesc;
 
                 stat &= ~(1 << irqno);
 
-                fpgadesc = irq_desc + FPGA_IRQ(irqno);
-
-                desc_handle_irq(FPGA_IRQ(irqno), fpgadesc);
+                generic_handle_irq(FPGA_IRQ(irqno));
         }
 
         desc->chip->unmask(irq);