summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2009-06-10 11:45:47 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2009-06-11 19:40:56 +0200
commit768c31495abe49227a96261b5aa19f34b30882b1 (patch)
tree0b7ecaf5f5f8e53862a2783a6d7d9de184bb1308 /arch/cris
parent91a120d03fd901fc8b95e85af7903358c5862d65 (diff)
downloadblackbird-op-linux-768c31495abe49227a96261b5aa19f34b30882b1.tar.gz
blackbird-op-linux-768c31495abe49227a96261b5aa19f34b30882b1.zip
CRISv32: irq.c - Move end brace outside #endif
The end brace for a larger for statement was placed inside the #else part of #ifdef TIMER_VECT1. However, for all current chips, the define TIMER_VECT1 is always unset, and the error was never triggered. Move the brace down below the #endif. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=13476 Reported-by: Martin Ettl <ettl.martin@gmx.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Mikael Starvik <mikael.starvik@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index df3925cb1c7f..9c9eb5b708fc 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -428,8 +428,8 @@ crisv32_do_multiple(struct pt_regs* regs)
masked[i] &= ~TIMER_MASK;
do_IRQ(TIMER0_INTR_VECT, regs);
}
- }
#endif
+ }
#ifdef IGNORE_MASK
/* Remove IRQs that can't be handled as multiple. */
OpenPOWER on IntegriCloud