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 /arch/sh | |
| parent | 7d8c4a2c5ae6d76f1142fb052d698b3c40ce518c (diff) | |
| parent | 39772038ea93e85ea4f1307ec9c1f48a063d89a0 (diff) | |
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 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 102f5d58b03..60ed3e1c4b7 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -69,7 +69,6 @@ static void pcibios_scanbus(struct pci_channel *hose) pci_bus_size_bridges(bus); pci_bus_assign_resources(bus); - pci_enable_bridges(bus); } else { pci_free_resource_list(&resources); } |