diff options
| author | Bjorn Helgaas | 2013-08-26 23:40:03 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2013-08-26 23:40:03 +0200 |
| commit | 1193725f543c92a77c73769bc2fbe48c53275f53 (patch) | |
| tree | 71ef007260a1584f4f48d7a7118a3157d01eb5f7 /drivers/pci/hotplug | |
| parent | Merge branch 'pci/aw-reset-v5' into next (diff) | |
| parent | PCI: Assign resources for hot-added host bridge more aggressively (diff) | |
| download | kernel-qcow2-linux-1193725f543c92a77c73769bc2fbe48c53275f53.tar.gz kernel-qcow2-linux-1193725f543c92a77c73769bc2fbe48c53275f53.tar.xz kernel-qcow2-linux-1193725f543c92a77c73769bc2fbe48c53275f53.zip | |
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/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 59df8575a48c..52dee9d31e1c 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -723,7 +723,6 @@ static int __ref enable_device(struct acpiphp_slot *slot) acpiphp_sanitize_bus(bus); acpiphp_set_hpp_values(bus); acpiphp_set_acpi_region(slot); - pci_enable_bridges(bus); list_for_each_entry(dev, &bus->devices, bus_list) { /* Assume that newly added devices are powered on already. */ |