aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/linux
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-01-17 16:00:36 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-01-17 16:00:36 -0700
commit708b59bfe1d1727451ca41f5dc4c17cf99dfaf51 (patch)
treeda5fb7826f92f90b58bb5f33ec552b52d3667152 /include/linux
parentMerge branch 'pci/yinghai-survey-resources+acpi-scan' into next (diff)
parentACPI / PCI: Set root bridge ACPI handle in advance (diff)
downloadwireguard-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/linux')
-rw-r--r--include/linux/pci.h2
1 files changed, 2 insertions, 0 deletions
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