diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/pci/pci.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 62ea04c8af64..3fec13d3add7 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -47,8 +47,10 @@ extern unsigned int pci_pm_d3_delay; | |||
| 47 | 47 | ||
| 48 | #ifdef CONFIG_PCI_MSI | 48 | #ifdef CONFIG_PCI_MSI |
| 49 | void pci_no_msi(void); | 49 | void pci_no_msi(void); |
| 50 | extern void pci_msi_init_pci_dev(struct pci_dev *dev); | ||
| 50 | #else | 51 | #else |
| 51 | static inline void pci_no_msi(void) { } | 52 | static inline void pci_no_msi(void) { } |
| 53 | static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } | ||
| 52 | #endif | 54 | #endif |
| 53 | 55 | ||
| 54 | #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM) | 56 | #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM) |