diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 19:15:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 19:15:57 +0200 |
| commit | 6d1d07e41a1de478a0da3cc14b4a8054ef09931c (patch) | |
| tree | db7802272fd8aff185a6ecc29ea78c1e3005783b /include | |
| parent | [PATCH] vesafb: Document mtrr boot option usage (diff) | |
| parent | merge 2.6.13-rc4 with ACPI's to-linus tree (diff) | |
| download | linux-6d1d07e41a1de478a0da3cc14b4a8054ef09931c.tar.xz linux-6d1d07e41a1de478a0da3cc14b4a8054ef09931c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/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 caeaa71a5663..579fe191b7e7 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 f85cbe919e13..b46a5205ee7b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -453,9 +453,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 @@ -480,9 +478,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; |