diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2013-01-17 16:00:36 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-17 16:00:36 -0700 |
| commit | 708b59bfe1d1727451ca41f5dc4c17cf99dfaf51 (patch) | |
| tree | da5fb7826f92f90b58bb5f33ec552b52d3667152 /include | |
| parent | Merge branch 'pci/yinghai-survey-resources+acpi-scan' into next (diff) | |
| parent | ACPI / PCI: Set root bridge ACPI handle in advance (diff) | |
| download | wireguard-linux-708b59bfe1d1727451ca41f5dc4c17cf99dfaf51.tar.xz wireguard-linux-708b59bfe1d1727451ca41f5dc4c17cf99dfaf51.zip | |
Merge branch 'pci/rafael-set-root-bridge-handle' into next
* pci/rafael-set-root-bridge-handle:
ACPI / PCI: Set root bridge ACPI handle in advance
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 | ||||
| -rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a9e1421cd007..796ccc3247df 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -402,7 +402,6 @@ struct acpi_pci_root { /* helper */ acpi_handle acpi_get_child(acpi_handle, u64); int acpi_is_root_bridge(acpi_handle); -acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)ACPI_HANDLE(dev)) diff --git a/include/linux/pci.h b/include/linux/pci.h index 907b455ab603..6860f4dec997 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -378,6 +378,8 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); + /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for |