diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-19 11:42:17 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-19 11:42:17 -0700 |
commit | 018ba0a6efada61b9bc17500101d81c3d35807c2 (patch) | |
tree | 13361ad9197c5021841a0ccf0bfb1dabfd6d424e /include | |
parent | fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1 (diff) | |
parent | 181380b702eee1a9aca51354d7b87c7b08541fcf (diff) | |
download | op-kernel-dev-018ba0a6efada61b9bc17500101d81c3d35807c2.zip op-kernel-dev-018ba0a6efada61b9bc17500101d81c3d35807c2.tar.gz |
Merge branch 'pci/yinghai-root-bus-hotplug' into next
* pci/yinghai-root-bus-hotplug:
PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_drivers.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 8b1d7a6..627749a 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -90,11 +90,6 @@ int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering, int *polarity, char **name); int acpi_pci_link_free_irq(acpi_handle handle); -/* ACPI PCI Interrupt Routing (pci_irq.c) */ - -int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus); -void acpi_pci_irq_del_prt(int segment, int bus); - /* ACPI PCI Device Binding (pci_bind.c) */ struct pci_bus; |