diff options
-rw-r--r-- | arch/x86/kernel/i8259_32.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c index 2d25b77102fe..fe631967d625 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259_32.c | |||
@@ -26,8 +26,6 @@ | |||
26 | * present in the majority of PC/AT boxes. | 26 | * present in the majority of PC/AT boxes. |
27 | * plus some generic x86 specific things if generic specifics makes | 27 | * plus some generic x86 specific things if generic specifics makes |
28 | * any sense at all. | 28 | * any sense at all. |
29 | * this file should become arch/i386/kernel/irq.c when the old irq.c | ||
30 | * moves to arch independent land | ||
31 | */ | 29 | */ |
32 | 30 | ||
33 | static int i8259A_auto_eoi; | 31 | static int i8259A_auto_eoi; |
@@ -362,23 +360,12 @@ void __init init_ISA_irqs (void) | |||
362 | #endif | 360 | #endif |
363 | init_8259A(0); | 361 | init_8259A(0); |
364 | 362 | ||
365 | for (i = 0; i < NR_IRQS; i++) { | 363 | /* |
366 | irq_desc[i].status = IRQ_DISABLED; | 364 | * 16 old-style INTA-cycle interrupts: |
367 | irq_desc[i].action = NULL; | 365 | */ |
368 | irq_desc[i].depth = 1; | 366 | for (i = 0; i < 16; i++) { |
369 | 367 | set_irq_chip_and_handler_name(i, &i8259A_chip, | |
370 | if (i < 16) { | 368 | handle_level_irq, "XT"); |
371 | /* | ||
372 | * 16 old-style INTA-cycle interrupts: | ||
373 | */ | ||
374 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
375 | handle_level_irq, "XT"); | ||
376 | } else { | ||
377 | /* | ||
378 | * 'high' PCI IRQs filled in on demand | ||
379 | */ | ||
380 | irq_desc[i].chip = &no_irq_chip; | ||
381 | } | ||
382 | } | 369 | } |
383 | } | 370 | } |
384 | 371 | ||