diff options
author | Andrew Patterson <andrew.patterson@hp.com> | 2008-11-10 17:31:05 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 14:12:31 -0500 |
commit | 07ae95f988a34465bdcb384bfa73c03424fe2312 (patch) | |
tree | 4e1901b7fd2ccfdb85a92953c0010a4d3900a3f8 /drivers/pci/pci.h | |
parent | eb9188bdb9d65aeead2382ec3dd656a17ec8936d (diff) |
ACPI/PCI: PCI MSI _OSC support capabilities called when root bridge added
The _OSC capability OSC_MSI_SUPPORT is set when the root bridge is added
with pci_acpi_osc_support(), so we no longer need to do it in the PCI
MSI driver. Also adds the function pci_msi_enabled, which returns true
if pci=nomsi is not on the kernel command-line.
Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d3e65e29df51..9162e242b99e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -102,11 +102,9 @@ extern unsigned int pci_pm_d3_delay; | |||
102 | #ifdef CONFIG_PCI_MSI | 102 | #ifdef CONFIG_PCI_MSI |
103 | void pci_no_msi(void); | 103 | void pci_no_msi(void); |
104 | extern void pci_msi_init_pci_dev(struct pci_dev *dev); | 104 | extern void pci_msi_init_pci_dev(struct pci_dev *dev); |
105 | extern void __devinit msi_init(void); | ||
106 | #else | 105 | #else |
107 | static inline void pci_no_msi(void) { } | 106 | static inline void pci_no_msi(void) { } |
108 | static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } | 107 | static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } |
109 | static inline void msi_init(void) { } | ||
110 | #endif | 108 | #endif |
111 | 109 | ||
112 | #ifdef CONFIG_PCIEAER | 110 | #ifdef CONFIG_PCIEAER |