diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:57:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:57:13 -0700 |
| commit | 5042d99795d3d817bef2f4cc46e953bee9bf7398 (patch) | |
| tree | 9263e28b67093eca6edd221f04830e5841f67c57 /include | |
| parent | 5c402355adf8f920531f02099f4ec0d2bccd4c64 (diff) | |
| parent | f17a077e61b627e58db5926bc474cf308318dad9 (diff) | |
| download | talos-obmc-linux-5042d99795d3d817bef2f4cc46e953bee9bf7398.tar.gz talos-obmc-linux-5042d99795d3d817bef2f4cc46e953bee9bf7398.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fixup sparse endianness warnings in proc.c
PCI PM: make more PCI PM core functionality available to drivers
PCI/DMAR: don't assume presence of RMRRs
PCI hotplug: fix error path in pci_slot's register_slot
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index a6a088e1a804..1d296d31abe0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -638,7 +638,9 @@ int pci_save_state(struct pci_dev *dev); int pci_restore_state(struct pci_dev *dev); int pci_set_power_state(struct pci_dev *dev, pci_power_t state); pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); +bool pci_pme_capable(struct pci_dev *dev, pci_power_t state); int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); +pci_power_t pci_target_state(struct pci_dev *dev); int pci_prepare_to_sleep(struct pci_dev *dev); int pci_back_from_sleep(struct pci_dev *dev); |
