diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-05 16:29:52 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-05 16:29:52 -0600 |
| commit | a7711ba1090a5fa1caa6e07182ac4e8e1c0da695 (patch) | |
| tree | f5682057d40e557e3816a977fbf9a4762d6716e2 /drivers/pci/pci.h | |
| parent | 85a00dd391d2de1e177c5ad8db5672428934ac20 (diff) | |
| parent | db288c9c5f9db45610dab3940377625132b4af41 (diff) | |
| download | talos-op-linux-a7711ba1090a5fa1caa6e07182ac4e8e1c0da695.tar.gz talos-op-linux-a7711ba1090a5fa1caa6e07182ac4e8e1c0da695.zip | |
Merge branch 'pci/rafael-pci_set_power_state-rebase' into next
* pci/rafael-pci_set_power_state-rebase:
PCI / PM: restore the original behavior of pci_set_power_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 ec1512de4297..bacbcba69cf3 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -67,6 +67,7 @@ struct pci_platform_pm_ops { extern int pci_set_platform_pm(struct pci_platform_pm_ops *ops); extern void pci_update_current_state(struct pci_dev *dev, pci_power_t state); +extern void pci_power_up(struct pci_dev *dev); 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); |
