diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 6 | ||||
-rw-r--r-- | arch/ia64/kernel/acpi.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 848bb97af7ca..364f4b7c4e3e 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
@@ -457,7 +457,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) | |||
457 | return 0; | 457 | return 0; |
458 | } | 458 | } |
459 | 459 | ||
460 | unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) | 460 | /* |
461 | * success: return IRQ number (>=0) | ||
462 | * failure: return < 0 | ||
463 | */ | ||
464 | int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) | ||
461 | { | 465 | { |
462 | unsigned int irq; | 466 | unsigned int irq; |
463 | unsigned int plat_gsi = gsi; | 467 | unsigned int plat_gsi = gsi; |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 1c118b72df3c..7513ff9361a0 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -565,7 +565,11 @@ acpi_numa_arch_fixup (void) | |||
565 | } | 565 | } |
566 | #endif /* CONFIG_ACPI_NUMA */ | 566 | #endif /* CONFIG_ACPI_NUMA */ |
567 | 567 | ||
568 | unsigned int | 568 | /* |
569 | * success: return IRQ number (>=0) | ||
570 | * failure: return < 0 | ||
571 | */ | ||
572 | int | ||
569 | acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) | 573 | acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) |
570 | { | 574 | { |
571 | if (has_8259 && gsi < 16) | 575 | if (has_8259 && gsi < 16) |