diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 10:20:05 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 10:20:05 -0700 |
| commit | 6c52f51ccbb371d9161a1081560df7d31df4c495 (patch) | |
| tree | d7f6a7e989c161840f3f7ea66edc846653e4ea19 /include | |
| parent | fa4378041e6c285399fa1a104d8dd77daae4529f (diff) | |
| parent | 5b764b834ea925b7fc87df4a87a0fde95acbecb9 (diff) | |
| download | linux-6c52f51ccbb371d9161a1081560df7d31df4c495.tar.bz2 | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Stop clearing bridge Secondary Status when setting up I/O aperture
PCI: Prevent bus conflicts while checking for bridge apertures
PCI: Drop "irq" param from *_restore_msi_irqs()
PCI/portdrv: Remove superfluous name cast
PCI: Clear NumVFs when disabling SR-IOV in sriov_init()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/msi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index 009b02481436..92a2f991262a 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -60,10 +60,10 @@ void arch_teardown_msi_irq(unsigned int irq); int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type); void arch_teardown_msi_irqs(struct pci_dev *dev); int arch_msi_check_device(struct pci_dev* dev, int nvec, int type); -void arch_restore_msi_irqs(struct pci_dev *dev, int irq); +void arch_restore_msi_irqs(struct pci_dev *dev); void default_teardown_msi_irqs(struct pci_dev *dev); -void default_restore_msi_irqs(struct pci_dev *dev, int irq); +void default_restore_msi_irqs(struct pci_dev *dev); u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag); |