diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:17:54 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:17:54 -0500 |
| commit | 7833b4ae466e084a865542c6fd83394a3d274144 (patch) | |
| tree | c8e19c460babcc6c844ac076a658385c240d69bd /include/linux | |
| parent | 86533e80e0a20ed1a676f9eeb2dde0fa5ff23276 (diff) | |
| parent | 61fd47e0c84764f49b4e52bfd8170fac52636f00 (diff) | |
Pull bugzilla-9153 into release branch
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 8ccedf7a0a5a..e3c16c981e46 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -132,6 +132,11 @@ extern unsigned long acpi_realmode_flags; int acpi_register_gsi (u32 gsi, int triggering, int polarity); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); +#ifdef CONFIG_X86_IO_APIC +extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity); +#else +#define acpi_get_override_irq(bus, trigger, polarity) (-1) +#endif /* * This function undoes the effect of one call to acpi_register_gsi(). * If this matches the last registration, any IRQ resources for gsi |