aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2006-10-09 22:23:31 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:54:46 -0700
commit69961c375288bdab7604e0bb1c8d22999bb8a347 (patch)
tree869e81d9798a8b41e7e9b35a992fe5794e9f28aa /arch/m68k/kernel
parentda96d0b58adddf3bdeaa9644ac74f0dcc9039407 (diff)
downloadlinux-2.6.34-ux500-69961c375288bdab7604e0bb1c8d22999bb8a347.tar.gz
[PATCH] m68k/Atari: Interrupt updates
Misc Atari fixes: - initialize correct number of atari irqs - silence vbl interrupt until it's used by atafb - use mdelay() to read clock if necessary Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/ints.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 849c9488c7f..84aceca6c05 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -132,6 +132,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
{
int i;
+ BUG_ON(IRQ_USER + cnt >= NR_IRQS);
m68k_first_user_vec = vec;
for (i = 0; i < cnt; i++)
irq_controller[IRQ_USER + i] = &user_irq_controller;