diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-16 10:37:22 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-16 10:37:22 -0600 |
| commit | a3b6bbd5774c13dab89d72f79976ba762913b2f2 (patch) | |
| tree | e646832db42284e97e6b4d1edc616ce06e0fd407 /include/linux/pci.h | |
| parent | 30e22b2337be44f4363fa52858d1ca7be6794ee8 (diff) | |
| parent | c309dbb4debb714566e4cf0d5d4e4023c3c4ff2f (diff) | |
| download | olio-linux-3.10-a3b6bbd5774c13dab89d72f79976ba762913b2f2.tar.xz olio-linux-3.10-a3b6bbd5774c13dab89d72f79976ba762913b2f2.zip | |
Merge branch 'pci/jiang-subdrivers' into next
* pci/jiang-subdrivers:
PCI/ACPI: Remove support of ACPI PCI subdrivers
PCI: acpiphp: Protect acpiphp data structures from concurrent updates
PCI: acpiphp: Use normal list to simplify implementation
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
PCI: acpiphp: Convert acpiphp to be builtin only, not modular
PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
x86/PCI: Implement pcibios_{add|remove}_bus() hooks
ia64/PCI: Implement pcibios_{add|remove}_bus() hooks
PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots
PCI: Add pcibios hooks for adding and removing PCI buses
PCI: acpiphp: Replace local macros with standard ACPI macros
PCI: acpiphp: Remove all functions even if function 0 doesn't exist
PCI: acpiphp: Use list_for_each_entry_safe() in acpiphp_sanitize_bus()
PCI: Clean up usages of pci_bus->is_added
PCI: When removing bus, always remove legacy files & unregister
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index bcd976976c3..4a6ee631a0c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -693,6 +693,8 @@ extern struct list_head pci_root_buses; /* list of all known PCI buses */ extern int no_pci_devices(void); void pcibios_resource_survey_bus(struct pci_bus *bus); +void pcibios_add_bus(struct pci_bus *bus); +void pcibios_remove_bus(struct pci_bus *bus); void pcibios_fixup_bus(struct pci_bus *); int __must_check pcibios_enable_device(struct pci_dev *, int mask); /* Architecture specific versions may override this (weak) */ |