Merge branch 'for-linus' of git://www.jni.nu/cris

[pandora-kernel.git] / arch / cris / arch-v32 / kernel / irq.c

diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index d70b445..57668db 100644 (file)
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -430,8 +430,8 @@ crisv32_do_multiple(struct pt_regs* regs)
                         masked[i] &= ~TIMER_MASK;
                         do_IRQ(TIMER0_INTR_VECT, regs);
                }
                         masked[i] &= ~TIMER_MASK;
                         do_IRQ(TIMER0_INTR_VECT, regs);
                }

-       }

 #endif
 #endif

+       }

 
 #ifdef IGNORE_MASK
        /* Remove IRQs that can't be handled as multiple. */
 
 #ifdef IGNORE_MASK
        /* Remove IRQs that can't be handled as multiple. */