diff options
Diffstat (limited to 'arch/m68k/atari/ataints.c')
-rw-r--r-- | arch/m68k/atari/ataints.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index ece13cbf9950..7f812641790c 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c | |||
@@ -332,6 +332,9 @@ static void atari_shutdown_irq(unsigned int irq) | |||
332 | atari_disable_irq(irq); | 332 | atari_disable_irq(irq); |
333 | atari_turnoff_irq(irq); | 333 | atari_turnoff_irq(irq); |
334 | m68k_irq_shutdown(irq); | 334 | m68k_irq_shutdown(irq); |
335 | |||
336 | if (irq == IRQ_AUTO_4) | ||
337 | vectors[VEC_INT4] = falcon_hblhandler; | ||
335 | } | 338 | } |
336 | 339 | ||
337 | static struct irq_controller atari_irq_controller = { | 340 | static struct irq_controller atari_irq_controller = { |
@@ -356,7 +359,7 @@ static struct irq_controller atari_irq_controller = { | |||
356 | 359 | ||
357 | void __init atari_init_IRQ(void) | 360 | void __init atari_init_IRQ(void) |
358 | { | 361 | { |
359 | m68k_setup_user_interrupt(VEC_USER, 192, NULL); | 362 | m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL); |
360 | m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1); | 363 | m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1); |
361 | 364 | ||
362 | /* Initialize the MFP(s) */ | 365 | /* Initialize the MFP(s) */ |
@@ -403,8 +406,10 @@ void __init atari_init_IRQ(void) | |||
403 | * gets overruns) | 406 | * gets overruns) |
404 | */ | 407 | */ |
405 | 408 | ||
406 | if (!MACH_IS_HADES) | 409 | if (!MACH_IS_HADES) { |
407 | vectors[VEC_INT2] = falcon_hblhandler; | 410 | vectors[VEC_INT2] = falcon_hblhandler; |
411 | vectors[VEC_INT4] = falcon_hblhandler; | ||
412 | } | ||
408 | } | 413 | } |
409 | 414 | ||
410 | if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) { | 415 | if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) { |