summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-28 03:59:17 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-28 03:59:17 +0300
commit4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (patch)
tree9b7e30a20c1f9d0db678f0ac10a33d2d917b49ca /drivers
parente001d7084a687c7a25b02bee47548a1df10d6e0b (diff)
parent4d9aac397a5d8f4ee26a4178b5e4a5c474a3a76a (diff)
downloadlinux-4941b8f0c2b9d88e8a6dacebf8b7faf603b98368.tar.xz
Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "Fix MSI/MSI-X on pseries from Guilherme" * tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b978bbfe044c..f6ae0d0052eb 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1108,7 +1108,7 @@ int pci_cfg_space_size(struct pci_dev *dev)
#define LEGACY_IO_RESOURCE (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
-static void pci_msi_setup_pci_dev(struct pci_dev *dev)
+void pci_msi_setup_pci_dev(struct pci_dev *dev)
{
/*
* Disable the MSI hardware to avoid screaming interrupts