diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 10:15:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 10:15:57 -0700 |
commit | 6d1d07e41a1de478a0da3cc14b4a8054ef09931c (patch) | |
tree | db7802272fd8aff185a6ecc29ea78c1e3005783b /include/acpi/acpi_drivers.h | |
parent | d7a465b4740806e4ee34061ad455595b2fa9fad5 (diff) | |
parent | adbedd34244e2b054557002817f979a9b004a405 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
Diffstat (limited to 'include/acpi/acpi_drivers.h')
-rw-r--r-- | include/acpi/acpi_drivers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index caeaa71a566..579fe191b7e 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) */ |