ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()

[karo-tx-linux.git] / arch / ia64 / pci / pci.c

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 2c27714d7b78302842bee1f6931c9f023e25c64a..3f9c86ad00faa8cc563ff9623cdd55121a38d6ed 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -387,8 +387,11 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
         * should handle the case here, but it appears that IA64 hasn't
         * such quirk. So we just ignore the case now.
         */
-       pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
+       pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller);
+       if (!pbus)
+               return NULL;
 
+       pbus->subordinate = pci_scan_child_bus(pbus);
        return pbus;
 
 out3:
@@ -514,6 +517,11 @@ pcibios_fixup_bus (struct pci_bus *b)
        return;
 }
 
+void pcibios_set_master (struct pci_dev *dev)
+{
+       /* No special bus mastering setup handling */
+}
+
 void __devinit
 pcibios_update_irq (struct pci_dev *dev, int irq)
 {