diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:03 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:03 -0600 |
| commit | 1193725f543c92a77c73769bc2fbe48c53275f53 (patch) | |
| tree | 71ef007260a1584f4f48d7a7118a3157d01eb5f7 /drivers/pci/probe.c | |
| parent | 7d8c4a2c5ae6d76f1142fb052d698b3c40ce518c (diff) | |
| parent | 39772038ea93e85ea4f1307ec9c1f48a063d89a0 (diff) | |
| download | linux-1193725f543c92a77c73769bc2fbe48c53275f53.tar.gz | |
Merge branch 'pci/yinghai-assign-unassigned-v6' into next
* pci/yinghai-assign-unassigned-v6:
PCI: Assign resources for hot-added host bridge more aggressively
PCI: Move resource reallocation code to non-__init
PCI: Delay enabling bridges until they're needed
PCI: Assign resources on a per-bus basis
PCI: Enable unassigned resource reallocation on per-bus basis
PCI: Turn on reallocation for unassigned resources with host bridge offset
PCI: Look for unassigned resources on per-bus basis
PCI: Drop temporary variable in pci_assign_unassigned_resources()
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cf57fe79450a..4ab388a6cc26 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1979,7 +1979,6 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus) max = pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); - pci_enable_bridges(bus); pci_bus_add_devices(bus); return max; |