diff options
Diffstat (limited to 'arch/i386/kernel/acpi/boot.c')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 2111529dea77..f21fa0d4482f 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
@@ -464,7 +464,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) | |||
464 | * success: return IRQ number (>=0) | 464 | * success: return IRQ number (>=0) |
465 | * failure: return < 0 | 465 | * failure: return < 0 |
466 | */ | 466 | */ |
467 | int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) | 467 | int acpi_register_gsi(u32 gsi, int triggering, int polarity) |
468 | { | 468 | { |
469 | unsigned int irq; | 469 | unsigned int irq; |
470 | unsigned int plat_gsi = gsi; | 470 | unsigned int plat_gsi = gsi; |
@@ -476,14 +476,14 @@ int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) | |||
476 | if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { | 476 | if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { |
477 | extern void eisa_set_level_irq(unsigned int irq); | 477 | extern void eisa_set_level_irq(unsigned int irq); |
478 | 478 | ||
479 | if (edge_level == ACPI_LEVEL_SENSITIVE) | 479 | if (triggering == ACPI_LEVEL_SENSITIVE) |
480 | eisa_set_level_irq(gsi); | 480 | eisa_set_level_irq(gsi); |
481 | } | 481 | } |
482 | #endif | 482 | #endif |
483 | 483 | ||
484 | #ifdef CONFIG_X86_IO_APIC | 484 | #ifdef CONFIG_X86_IO_APIC |
485 | if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) { | 485 | if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) { |
486 | plat_gsi = mp_register_gsi(gsi, edge_level, active_high_low); | 486 | plat_gsi = mp_register_gsi(gsi, triggering, polarity); |
487 | } | 487 | } |
488 | #endif | 488 | #endif |
489 | acpi_gsi_to_irq(plat_gsi, &irq); | 489 | acpi_gsi_to_irq(plat_gsi, &irq); |