diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-23 13:59:43 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-23 13:59:43 -0400 |
| commit | 35e7f73c32ad44a931d918d04e317a7fb0c63e6e (patch) | |
| tree | e3cb8c89c8230aaa45a0f1b101decdc3b9831938 /drivers/pci/pci.h | |
| parent | e5028b52e46eb1379d78d136bd0890705f331183 (diff) | |
| parent | 448bd857d48e69b33ef323739dc6d8ca20d4cda7 (diff) | |
Merge branch 'topic/huang-d3cold-v7' into next
* topic/huang-d3cold-v7:
PCI/PM: add PCIe runtime D3cold support
PCI: do not call pci_set_power_state with PCI_D3cold
PCI/PM: add runtime PM support to PCIe port
ACPI/PM: specify lowest allowed state for device sleep state
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4884d77d33b6..ec1512de4297 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -70,6 +70,7 @@ extern void pci_update_current_state(struct pci_dev *dev, pci_power_t state); | |||
| 70 | extern void pci_disable_enabled_device(struct pci_dev *dev); | 70 | extern void pci_disable_enabled_device(struct pci_dev *dev); |
| 71 | extern int pci_finish_runtime_suspend(struct pci_dev *dev); | 71 | extern int pci_finish_runtime_suspend(struct pci_dev *dev); |
| 72 | extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign); | 72 | extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign); |
| 73 | extern void pci_wakeup_bus(struct pci_bus *bus); | ||
| 73 | extern void pci_pm_init(struct pci_dev *dev); | 74 | extern void pci_pm_init(struct pci_dev *dev); |
| 74 | extern void platform_pci_wakeup_init(struct pci_dev *dev); | 75 | extern void platform_pci_wakeup_init(struct pci_dev *dev); |
| 75 | extern void pci_allocate_cap_save_buffers(struct pci_dev *dev); | 76 | extern void pci_allocate_cap_save_buffers(struct pci_dev *dev); |