diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /drivers/pci/pci.h | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 8f3fb47ea671..30630cbe2fe3 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -55,6 +55,17 @@ void pci_no_msi(void); | |||
| 55 | static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { } | 55 | static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { } |
| 56 | static inline void pci_no_msi(void) { } | 56 | static inline void pci_no_msi(void) { } |
| 57 | #endif | 57 | #endif |
| 58 | #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM) | ||
| 59 | int pci_save_msi_state(struct pci_dev *dev); | ||
| 60 | int pci_save_msix_state(struct pci_dev *dev); | ||
| 61 | void pci_restore_msi_state(struct pci_dev *dev); | ||
| 62 | void pci_restore_msix_state(struct pci_dev *dev); | ||
| 63 | #else | ||
| 64 | static inline int pci_save_msi_state(struct pci_dev *dev) { return 0; } | ||
| 65 | static inline int pci_save_msix_state(struct pci_dev *dev) { return 0; } | ||
| 66 | static inline void pci_restore_msi_state(struct pci_dev *dev) {} | ||
| 67 | static inline void pci_restore_msix_state(struct pci_dev *dev) {} | ||
| 68 | #endif | ||
| 58 | 69 | ||
| 59 | extern int pcie_mch_quirk; | 70 | extern int pcie_mch_quirk; |
| 60 | extern struct device_attribute pci_dev_attrs[]; | 71 | extern struct device_attribute pci_dev_attrs[]; |