diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-28 20:55:41 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-28 20:55:41 -0600 |
| commit | 2e8b5f621dbe29425906852c6079afb6b28720cb (patch) | |
| tree | 178a58a6dee0599d8b119d6c72969f9b6f4e37ac /include/linux/pci.h | |
| parent | 07f2daad094bc9e9770143cd2d619de24d84bb3e (diff) | |
| parent | fed2451512495f0f0820ac9e53936bd208569bc8 (diff) | |
| download | op-kernel-dev-2e8b5f621dbe29425906852c6079afb6b28720cb.zip op-kernel-dev-2e8b5f621dbe29425906852c6079afb6b28720cb.tar.gz | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Remove pcie_cap_has_devctl()
PCI: Support PCIe Capability Slot registers only for ports with slots
PCI: Remove PCIe Capability version checks
PCI: Allow PCIe Capability link-related register access for switches
PCI: Add offsets of PCIe capability registers
PCI: Tidy bitmasks and spacing of PCIe capability definitions
PCI: Remove obsolete comment reference to pci_pcie_cap2()
PCI: Clarify PCI_EXP_TYPE_PCI_BRIDGE comment
PCI: Rename PCIe capability definitions to follow convention
PCI: Disable decoding for BAR sizing only when it was actually enabled
PCI: Add comment about needing pci_msi_off() even when CONFIG_PCI_MSI=n
PCI: Add pcibios_pm_ops for optional arch-specific hibernate functionality
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index b3b7165..186540d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1654,6 +1654,10 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, int pcibios_add_device(struct pci_dev *dev); void pcibios_release_device(struct pci_dev *dev); +#ifdef CONFIG_HIBERNATE_CALLBACKS +extern struct dev_pm_ops pcibios_pm_ops; +#endif + #ifdef CONFIG_PCI_MMCONFIG void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_late_init(void); |
