diff options
author | Len Brown <len.brown@intel.com> | 2005-08-05 06:31:42 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-05 06:31:42 +0200 |
commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /arch/ia64/kernel/acpi.c | |
parent | /home/lenb/src/to-akpm branch 'acpi-2.6.12' (diff) | |
parent | [ACPI] ACPI_HOTPLUG_CPU Kconfig dependency update (diff) | |
download | linux-1d492eb41371d9a5145651e8eb64bea1042a4057.tar.xz linux-1d492eb41371d9a5145651e8eb64bea1042a4057.zip |
[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) } #endif /* CONFIG_ACPI_NUMA */ -unsigned int +/* + * success: return IRQ number (>=0) + * failure: return < 0 + */ +int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) { if (has_8259 && gsi < 16) |