diff options
author | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:34 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:34 -0500 |
commit | 8f6d63adf8309a412bf2d3d2e49a85e519ebf57c (patch) | |
tree | 52350c430591a1f740d608daa710be0c7151d339 /arch/ia64/kernel/acpi.c | |
parent | 85f4544fbf02f60993c76f5b92517a87f220472d (diff) | |
parent | 3948ec9406f9a60a43d63f23f6f5284db6529b9c (diff) |
Pull sgi into release branch
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 73ef4a85b86..ef2fe474f10 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void) */ int acpi_register_gsi(u32 gsi, int triggering, int polarity) { + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) + return gsi; + if (has_8259 && gsi < 16) return isa_irq_to_vector(gsi); |