diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 13:00:57 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 13:00:57 -0700 |
| commit | d3fe3988fb24e5ed13b2243b789a652882d3b26c (patch) | |
| tree | 1257424a712583bf474cb0831621a47e73dfc3de /drivers/pci/pci.h | |
| parent | 7db78a9c864d1baf916d849febef31e274cfcb1f (diff) | |
| parent | ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc (diff) | |
| download | op-kernel-dev-d3fe3988fb24e5ed13b2243b789a652882d3b26c.zip op-kernel-dev-d3fe3988fb24e5ed13b2243b789a652882d3b26c.tar.gz | |
Merge branch 'for-linus' into next
* for-linus:
PCI/portdrv: Don't create hotplug slots unless port supports hotplug
PCI/PM: Fix proc config reg access for D3cold and bridge suspending
PCI/PM: Resume device before shutdown
PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 3c9443e..11a713b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -72,6 +72,8 @@ extern void pci_disable_enabled_device(struct pci_dev *dev); extern int pci_finish_runtime_suspend(struct pci_dev *dev); extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign); extern void pci_wakeup_bus(struct pci_bus *bus); +extern void pci_config_pm_runtime_get(struct pci_dev *dev); +extern void pci_config_pm_runtime_put(struct pci_dev *dev); extern void pci_pm_init(struct pci_dev *dev); extern void platform_pci_wakeup_init(struct pci_dev *dev); extern void pci_allocate_cap_save_buffers(struct pci_dev *dev); |
