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 | |
| parent | c2c2e03409f5f5405e79d9d9156202b75cb5b35b (diff) | |
| parent | 87bec66b9691522414862dd8d41e430b063735ef (diff) | |
| download | op-kernel-dev-dd8f39bbf5154cdbfd698fc70c66faba33eafa44.zip op-kernel-dev-dd8f39bbf5154cdbfd698fc70c66faba33eafa44.tar.gz | |
Merge ../to-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 3 | ||||
| -rw-r--r-- | include/linux/acpi.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index e00d928..13f0929 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) */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 9c14959..ca0cd24 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -440,9 +440,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); * If this matches the last registration, any IRQ resources for gsi * are freed. */ -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ void acpi_unregister_gsi (u32 gsi); -#endif #ifdef CONFIG_ACPI_PCI @@ -467,9 +465,7 @@ struct pci_dev; int acpi_pci_irq_enable (struct pci_dev *dev); void acpi_penalize_isa_irq(int irq, int active); -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ void acpi_pci_irq_disable (struct pci_dev *dev); -#endif struct acpi_pci_driver { struct acpi_pci_driver *next; |
