Commit a5fae846 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge remote-tracking branch 'lorenzo/pci/xgene' into next 

* lorenzo/pci/xgene:
  PCI: xgene: Remove leftover pci_scan_child_bus() call
parents 163b716d 94b9d290

drivers/pci/host/pci-xgene.c

+0 −1
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ static int xgene_pcie_probe(struct platform_device *pdev) 


	bus = bridge->bus;



	pci_scan_child_bus(bus);

	pci_assign_unassigned_bus_resources(bus);

	list_for_each_entry(child, &bus->children, node)

		pcie_bus_configure_settings(child);