diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
| commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
| tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /arch/ia64/kernel/acpi.c | |
| parent | 5d2a22079c825669d91a3a200332f1053b4b61b0 (diff) | |
| parent | cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff) | |
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 9609f243e5d0..d362ecf5381b 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -563,7 +563,11 @@ acpi_numa_arch_fixup (void) | |||
| 563 | } | 563 | } |
| 564 | #endif /* CONFIG_ACPI_NUMA */ | 564 | #endif /* CONFIG_ACPI_NUMA */ |
| 565 | 565 | ||
| 566 | unsigned int | 566 | /* |
| 567 | * success: return IRQ number (>=0) | ||
| 568 | * failure: return < 0 | ||
| 569 | */ | ||
| 570 | int | ||
| 567 | acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) | 571 | acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) |
| 568 | { | 572 | { |
| 569 | if (has_8259 && gsi < 16) | 573 | if (has_8259 && gsi < 16) |