summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-07-30 05:11:11 +0200
committerLen Brown <len.brown@intel.com>2005-07-30 05:11:11 +0200
commitdd8f39bbf5154cdbfd698fc70c66faba33eafa44 (patch)
tree9df3fe38a57d0ea056ffa11b1fb95b8908e73af5 /include/acpi
parent[ACPI] update hotkey documentation (diff)
parent[ACPI] suspend/resume ACPI PCI Interrupt Links (diff)
downloadlinux-dd8f39bbf5154cdbfd698fc70c66faba33eafa44.tar.xz
linux-dd8f39bbf5154cdbfd698fc70c66faba33eafa44.zip
Merge ../to-linus
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_drivers.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index e00d9289201b..13f092977c0c 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -56,8 +56,9 @@
/* ACPI PCI Interrupt Link (pci_link.c) */
int acpi_irq_penalty_init (void);
-int acpi_pci_link_get_irq (acpi_handle handle, int index, int *edge_level,
+int acpi_pci_link_allocate_irq (acpi_handle handle, int index, int *edge_level,
int *active_high_low, char **name);
+int acpi_pci_link_free_irq(acpi_handle handle);
/* ACPI PCI Interrupt Routing (pci_irq.c) */