diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index afd2afe9102d..25337f2b7399 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -99,7 +99,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; | |||
99 | 99 | ||
100 | /* | 100 | /* |
101 | * The default interrupt routing model is PIC (8259). This gets | 101 | * The default interrupt routing model is PIC (8259). This gets |
102 | * overriden if IOAPICs are enumerated (below). | 102 | * overridden if IOAPICs are enumerated (below). |
103 | */ | 103 | */ |
104 | enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; | 104 | enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; |
105 | 105 | ||
@@ -414,8 +414,8 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end | |||
414 | * | 414 | * |
415 | * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers | 415 | * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers |
416 | * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. | 416 | * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. |
417 | * ECLR1 is IRQ's 0-7 (IRQ 0, 1, 2 must be 0) | 417 | * ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0) |
418 | * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0) | 418 | * ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0) |
419 | */ | 419 | */ |
420 | 420 | ||
421 | void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) | 421 | void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) |
@@ -427,7 +427,7 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) | |||
427 | old = inb(0x4d0) | (inb(0x4d1) << 8); | 427 | old = inb(0x4d0) | (inb(0x4d1) << 8); |
428 | 428 | ||
429 | /* | 429 | /* |
430 | * If we use ACPI to set PCI irq's, then we should clear ELCR | 430 | * If we use ACPI to set PCI IRQs, then we should clear ELCR |
431 | * since we will set it correctly as we enable the PCI irq | 431 | * since we will set it correctly as we enable the PCI irq |
432 | * routing. | 432 | * routing. |
433 | */ | 433 | */ |