aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorAndrew Patterson <andrew.patterson@hp.com>2008-11-10 17:31:05 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 14:12:31 -0500
commit07ae95f988a34465bdcb384bfa73c03424fe2312 (patch)
tree4e1901b7fd2ccfdb85a92953c0010a4d3900a3f8 /drivers/pci/pci.h
parenteb9188bdb9d65aeead2382ec3dd656a17ec8936d (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.h2
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
103void pci_no_msi(void); 103void pci_no_msi(void);
104extern void pci_msi_init_pci_dev(struct pci_dev *dev); 104extern void pci_msi_init_pci_dev(struct pci_dev *dev);
105extern void __devinit msi_init(void);
106#else 105#else
107static inline void pci_no_msi(void) { } 106static inline void pci_no_msi(void) { }
108static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } 107static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
109static inline void msi_init(void) { }
110#endif 108#endif
111 109
112#ifdef CONFIG_PCIEAER 110#ifdef CONFIG_PCIEAER