summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorAndrew Patterson <andrew.patterson@hp.com>2008-11-10 22:31:05 (GMT)
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 19:12:31 (GMT)
commit07ae95f988a34465bdcb384bfa73c03424fe2312 (patch)
tree4e1901b7fd2ccfdb85a92953c0010a4d3900a3f8 /drivers/pci/pci.c
parenteb9188bdb9d65aeead2382ec3dd656a17ec8936d (diff)
downloadlinux-fsl-qoriq-07ae95f988a34465bdcb384bfa73c03424fe2312.tar.xz
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.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 48fa860..2cfa41e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2105,8 +2105,6 @@ static int __devinit pci_init(void)
pci_fixup_device(pci_fixup_final, dev);
}
- msi_init();
-
return 0;
}