diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-09 11:37:16 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-09 11:37:16 -0700 |
| commit | e84813c0cba2af80f0910484f5ba4931375f57ba (patch) | |
| tree | c400c9c06465f3c6888bbc91fe759c51056e5463 /drivers/pci | |
| parent | e84d0dedd324379bd784be748314b251334a79b6 (diff) | |
| parent | b3e65e1f9185a2eb034defe4270ba178ba70b9a9 (diff) | |
Merge branch 'pci/yinghai-survey-resources' into next
* pci/yinghai-survey-resources:
x86/PCI: Implement pcibios_resource_survey_bus()
PCI/ACPI: Reserve firmware-allocated resources for hot-added root buses
x86/PCI: Keep resource allocation functions after boot
x86/PCI: Don't track firmware-assigned BAR values for hot-added devices
x86/PCI: Factor out pcibios_allocate_dev_rom_resource()
x86/PCI: Allocate resources on a per-bus basis for hot-adding root buses
x86/PCI: Factor out pcibios_allocate_dev_resources()
x86/PCI: Factor out pcibios_allocate_bridge_resources()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/bus.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index ad6a8b63569..847f3ca47bb 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -158,6 +158,8 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, return ret; } +void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { } + /** * pci_bus_add_device - add a single device * @dev: device to add |