Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / ia64 / pci / pci.c

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 55b72ad573292d58af2d6eff037a46bab8d75dba..60532ab2734684eafc036e5a5bc88194b7bae142 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -393,6 +393,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 is_valid_resource(struct pci_dev *dev, int idx)
 {
        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;