diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-27 17:59:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-27 17:59:17 -0700 |
commit | 4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (patch) | |
tree | 9b7e30a20c1f9d0db678f0ac10a33d2d917b49ca /include | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case (diff) | |
download | linux-dev-4941b8f0c2b9d88e8a6dacebf8b7faf603b98368.tar.xz linux-dev-4941b8f0c2b9d88e8a6dacebf8b7faf603b98368.zip |
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 'include')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 8a0321a8fb59..860c751810fc 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1202,6 +1202,7 @@ struct msix_entry { u16 entry; /* driver uses to specify entry, OS writes */ }; +void pci_msi_setup_pci_dev(struct pci_dev *dev); #ifdef CONFIG_PCI_MSI int pci_msi_vec_count(struct pci_dev *dev); |