Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[mv-sheeva.git] / arch / arm / mach-lh7a40x / irq-lpd7a40x.c

diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
index 0d5063ebda10f51caf9641660575ee238a7d2852..fd033bb4342fc37f928bece12fcfb969fead5610 100644 (file)
--- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
@@ -63,10 +63,10 @@ static void lh7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)
        desc->chip->ack (irq);
 
        if ((mask & 0x1) == 0)  /* WLAN */
-               IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);
+               generic_handle_irq(IRQ_LPD7A40X_ETH_INT);
 
        if ((mask & 0x2) == 0)  /* Touch */
-               IRQ_DISPATCH (IRQ_LPD7A400_TS);
+               generic_handle_irq(IRQ_LPD7A400_TS);
 
        desc->chip->unmask (irq); /* Level-triggered need this */
 }