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/i386 | |
| 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/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index b7808a89d94..55c0fbd6895 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -484,7 +484,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) return 0; } -unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) +/* + * success: return IRQ number (>=0) + * failure: return < 0 + */ +int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) { unsigned int irq; unsigned int plat_gsi = gsi; |