Merge branch 's3c-move' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-lh7a40x / arch-lpd7a40x.c

diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index fe64946f9e18ea824efa6839745143c3e326cf92..cb15e5d321202690912bf33b184bfa5f9e2f7717 100644 (file)
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -214,11 +214,11 @@ static void lpd7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)
        desc->chip->ack (irq);
 
        if ((mask & (1<<0)) == 0)       /* WLAN */
-               IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);
+               generic_handle_irq(IRQ_LPD7A40X_ETH_INT);
 
 #if defined (IRQ_TOUCH)
        if ((mask & (1<<1)) == 0)       /* Touch */
-               IRQ_DISPATCH (IRQ_TOUCH);
+               generic_handle_irq(IRQ_TOUCH);
 #endif
 
        desc->chip->unmask (irq); /* Level-triggered need this */