git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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);
}
- }
#endif
+ }
#ifdef IGNORE_MASK
/* Remove IRQs that can't be handled as multiple. */