diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2006-10-09 16:23:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:54:46 -0400 |
commit | 69961c375288bdab7604e0bb1c8d22999bb8a347 (patch) | |
tree | 869e81d9798a8b41e7e9b35a992fe5794e9f28aa /arch/m68k/kernel | |
parent | da96d0b58adddf3bdeaa9644ac74f0dcc9039407 (diff) |
[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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 849c9488c7f8..84aceca6c05c 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, | |||
132 | { | 132 | { |
133 | int i; | 133 | int i; |
134 | 134 | ||
135 | BUG_ON(IRQ_USER + cnt >= NR_IRQS); | ||
135 | m68k_first_user_vec = vec; | 136 | m68k_first_user_vec = vec; |
136 | for (i = 0; i < cnt; i++) | 137 | for (i = 0; i < cnt; i++) |
137 | irq_controller[IRQ_USER + i] = &user_irq_controller; | 138 | irq_controller[IRQ_USER + i] = &user_irq_controller; |