sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'pci/rafael-pci_set_power_state-rebase' into next

Browse Source 
* pci/rafael-pci_set_power_state-rebase:
  PCI / PM: restore the original behavior of pci_set_power_state()
This commit is contained in:
Bjorn Helgaas
2012-07-05 16:29:52 -06:00
parent 85a00dd391 db288c9c5f
commit a7711ba109
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/pci.h
View File

@@ -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);