diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-29 23:11:11 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-29 23:11:11 -0400 |
| commit | dd8f39bbf5154cdbfd698fc70c66faba33eafa44 (patch) | |
| tree | 9df3fe38a57d0ea056ffa11b1fb95b8908e73af5 /include/acpi | |
| parent | c2c2e03409f5f5405e79d9d9156202b75cb5b35b (diff) | |
| parent | 87bec66b9691522414862dd8d41e430b063735ef (diff) | |
Merge ../to-linus
Diffstat (limited to 'include/acpi')
| -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 e00d9289201b..13f092977c0c 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -56,8 +56,9 @@ | |||
| 56 | /* ACPI PCI Interrupt Link (pci_link.c) */ | 56 | /* ACPI PCI Interrupt Link (pci_link.c) */ |
| 57 | 57 | ||
| 58 | int acpi_irq_penalty_init (void); | 58 | int acpi_irq_penalty_init (void); |
| 59 | int acpi_pci_link_get_irq (acpi_handle handle, int index, int *edge_level, | 59 | int acpi_pci_link_allocate_irq (acpi_handle handle, int index, int *edge_level, |
| 60 | int *active_high_low, char **name); | 60 | int *active_high_low, char **name); |
| 61 | int acpi_pci_link_free_irq(acpi_handle handle); | ||
| 61 | 62 | ||
| 62 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ | 63 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ |
| 63 | 64 | ||