diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-01 11:40:06 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-01 11:40:06 -0600 |
| commit | a5fae846f21d82bb2d41f8726e1b2a4da338b59c (patch) | |
| tree | ae77ce0eb684cab10c92da430dab4350a06bf14f /drivers/pci | |
| parent | 163b716d056304fdfaed02badbf97e6cd1403491 (diff) | |
| parent | 94b9d290b753cbbc87971ee134511245f5872a83 (diff) | |
| download | linux-stable-a5fae846f21d82bb2d41f8726e1b2a4da338b59c.tar.gz linux-stable-a5fae846f21d82bb2d41f8726e1b2a4da338b59c.tar.bz2 linux-stable-a5fae846f21d82bb2d41f8726e1b2a4da338b59c.zip | |
Merge remote-tracking branch 'lorenzo/pci/xgene' into next
* lorenzo/pci/xgene:
PCI: xgene: Remove leftover pci_scan_child_bus() call
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-xgene.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index 465aa2a1b38d..e60c457cefdb 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -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); |