diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 17:35:58 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 17:35:58 -0700 |
| commit | 939de1d69c5fb0da0cfe05a1a7c981421cf876f7 (patch) | |
| tree | 3ca1c6457e1c1ae4c11adab60e94d666841983aa /drivers/pci/pci.h | |
| parent | fb455792d91469fe556b68f1baa9ff5493432be8 (diff) | |
| parent | 4f535093cf8f6da8cfda7c36c2c1ecd2e9586ee4 (diff) | |
Merge branch 'pci/yinghai-root-bus-hotplug' into next
* pci/yinghai-root-bus-hotplug:
PCI: Put pci_dev in device tree as early as possible
PCI: Skip attaching driver in device_add()
PCI: acpiphp: Keep driver loaded even if no slots found
PCI/ACPI: Print info if host bridge notify handler installation fails
PCI: acpiphp: Move host bridge hotplug to pci_root.c
PCI/ACPI: acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work()
PCI: Make device create/destroy logic symmetric
PCI: Fix reference count leak in pci_dev_present()
PCI: Set pci_dev dev_node early so IOAPIC irq_descs are allocated locally
PCI: Add root bus children dev's res to fail list
PCI: acpiphp: Add is_hotplug_bridge detection
Conflicts:
drivers/pci/pci.h
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 81b6a875251..7346ee68f47 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -203,8 +203,8 @@ extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, struct resource *res, unsigned int reg); extern int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); -extern int pci_bus_add_child(struct pci_bus *bus); extern void pci_configure_ari(struct pci_dev *dev); + /** * pci_ari_enabled - query ARI forwarding status * @bus: the PCI bus |