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 /arch/ia64/pci/pci.c | |
| parent | b7040469de97d361120836b4140941a08d06f56f (diff) | |
| parent | 6c0cc950ae670403a362bdcbf3cde0df33744928 (diff) | |
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 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 5faa66c5c2a8..00e59c7ad3c0 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -396,6 +396,14 @@ out1: return NULL; } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + struct pci_controller *controller = bridge->bus->sysdata; + + ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle); + return 0; +} + static int __devinit is_valid_resource(struct pci_dev *dev, int idx) { unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; |