diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-10-30 21:31:26 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-03 23:20:30 +0100 |
commit | e164f658f209b85566732bd85c62009237be0909 (patch) | |
tree | 1e8d6dcb7c5a5755a97b35ab82edbdda78a25404 /drivers/pci/probe.c | |
parent | PCI: Move pci_rescan_bus() back to probe.c (diff) | |
download | linux-e164f658f209b85566732bd85c62009237be0909.tar.xz linux-e164f658f209b85566732bd85c62009237be0909.zip |
PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res
So could use assign_unassigned_bus_res pci root bus add
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 65f62e353719..59cf1ba34936 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1905,6 +1905,7 @@ 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; |