update netfilter patches, fix atheros

[openwrt.git] / target / linux / atheros-2.6 / files / arch / mips / atheros / irq.c

diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c b/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
index 99d960b..5665aa3 100644 (file)
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
@@ -67,30 +67,18 @@ static struct irqaction spurious_misc  = {
 
 asmlinkage void plat_irq_dispatch(void)
 {
-#ifdef CONFIG_ATHEROS_AR5312
-       if (mips_machtype == MACH_ATHEROS_AR5312)
-               ar5312_irq_dispatch();
-#endif
-#ifdef CONFIG_ATHEROS_AR5315
-       if (mips_machtype == MACH_ATHEROS_AR5315)
-               ar5315_irq_dispatch();
-#endif
+       DO_AR5312(ar5312_irq_dispatch();)
+       DO_AR5315(ar5315_irq_dispatch();)
 }
 
 void __init arch_init_irq(void)
 {
        clear_c0_status(ST0_IM);
-       mips_cpu_irq_init(0);
+       mips_cpu_irq_init();
 
        /* Initialize interrupt controllers */
-#ifdef CONFIG_ATHEROS_AR5312
-       if (mips_machtype == MACH_ATHEROS_AR5312)
-               ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);
-#endif
-#ifdef CONFIG_ATHEROS_AR5315
-       if (mips_machtype == MACH_ATHEROS_AR5315)
-               ar5315_misc_intr_init(AR531X_MISC_IRQ_BASE);
-#endif
+       DO_AR5312(ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);)
+       DO_AR5315(ar5315_misc_intr_init(AR531X_MISC_IRQ_BASE);)
 
        /* Default "spurious interrupt" handlers */
        setup_irq(AR531X_IRQ_NONE, &spurious_irq);