Merge branch 'pci/yinghai-for-pci-root-bus-hotplug' into next

Browse source

* pci/yinghai-for-pci-root-bus-hotplug:
  PCI/ACPI: Remove acpi_root_driver in reverse order
  PCI/ACPI: Delete host bridge _PRT during hot remove path
  PCI/ACPI: Make acpi_pci_root_remove() stop/remove pci root bus
  PCI: Add pci_stop_and_remove_root_bus()
  PCI/ACPI: Assign unassigned resource for hot-added root bus
  PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res
  PCI: Move pci_rescan_bus() back to probe.c
  PCI: Separate out pci_assign_unassigned_bus_resources()

...

This commit is contained in:

Bjorn Helgaas 2012-11-09 10:00:02 -07:00

parent 13a8468709 f426cef3bc

commit fa20f6f240

5 changed files with 82 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

drivers/acpi/pci_root.c

View file

22

drivers/pci/probe.c

View file

36

drivers/pci/remove.c

View file

22

drivers/pci/setup-bus.c

View file

3

include/linux/pci.h

View file