diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 12:41:40 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 12:41:40 -0700 |
| commit | 47e0ab3f39aec53d9b7ac77dbe11a645e40583f9 (patch) | |
| tree | 2d7c413a4bf808851f990416ce75c2c978332323 /Documentation/PCI | |
| parent | f72e11123ba122c4ed8fcee52ab57cf3fbe81178 (diff) | |
| parent | 52179dc9edc3b7a2b3bb01cbb1b6c96f6d05fc73 (diff) | |
| download | linux-47e0ab3f39aec53d9b7ac77dbe11a645e40583f9.tar.bz2 | |
Merge branch 'pci/msi' into next
* pci/msi:
PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int
PCI/MSI: Return -ENOSYS for unimplemented interfaces, not -1
PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails
s390/PCI: Remove superfluous check of MSI type
s390/PCI: Fix single MSI only check
PCI/MSI: Export MSI mode using attributes, not kobjects
Diffstat (limited to 'Documentation/PCI')
| -rw-r--r-- | Documentation/PCI/MSI-HOWTO.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt index a09178086c30..a4d174e95413 100644 --- a/Documentation/PCI/MSI-HOWTO.txt +++ b/Documentation/PCI/MSI-HOWTO.txt @@ -129,7 +129,7 @@ call to succeed. 4.2.3 pci_enable_msi_block_auto -int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *count) +int pci_enable_msi_block_auto(struct pci_dev *dev, int *count) This variation on pci_enable_msi() call allows a device driver to request the maximum possible number of MSIs. The MSI specification only allows |