diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-08-31 11:25:26 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-08-31 11:25:26 +0300 |
commit | 02b643b643254ec79b5f9aaa143e10be68eabdab (patch) | |
tree | 57ec83eebab74324465199a3f52f4f7862177ee6 /arch/powerpc | |
parent | d1ee8bc195ffedbf91af0245a2406d6ebd2578f8 (diff) | |
parent | 4c09e0d6ba65507a0ee0ca9abc5335e4f7bd7404 (diff) | |
download | linux-02b643b643254ec79b5f9aaa143e10be68eabdab.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/pci_of_scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 42e02a2d570b..efc3fa54c90b 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c @@ -191,6 +191,9 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, pci_device_add(dev, bus); + /* Setup MSI caps & disable MSI/MSI-X interrupts */ + pci_msi_setup_pci_dev(dev); + return dev; } EXPORT_SYMBOL(of_create_pci_dev); |