diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:08:48 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:08:48 -0600 |
commit | 726246d2e6d0ed53ac22b6fec50d1345f25e6730 (patch) | |
tree | a02c267d02bfea91fa106e17b8ee22675881d848 /include/linux/pci.h | |
parent | 5899309c90971d5418abc4bf370bee871ff6072c (diff) | |
parent | fc6504b3a4dc9beae782a11e6f7c3c4a9f077fb8 (diff) |
Merge branch 'pci/misc' into next
* pci/misc:
PCI / ACPI / PM: Use correct power state strings in messages
PCI: Fix comment typo for pcie_pme_remove()
PCI: Add pcibios_release_device()
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3a24e4ff3248..8f170e9073a5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1643,6 +1643,7 @@ void pcibios_set_master(struct pci_dev *dev); int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state); int pcibios_add_device(struct pci_dev *dev); +void pcibios_release_device(struct pci_dev *dev); #ifdef CONFIG_PCI_MMCONFIG void __init pci_mmcfg_early_init(void); |