summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2011-07-15 03:12:13 +0000
committerMichael Witten <mfwitten@gmail.com>2011-08-02 21:34:37 +0000
commite14bd7e614b57493e1cbefb8a06d3754bdd04e26 (patch)
tree0bba9dc814abfa4ecb76385d54fd732408e59fa9 /Documentation
parente6ffceb0ded9beeaddd9c246b3fec298c6b1f0c9 (diff)
downloadlinux-stable-e14bd7e614b57493e1cbefb8a06d3754bdd04e26.tar.gz
linux-stable-e14bd7e614b57493e1cbefb8a06d3754bdd04e26.tar.bz2
linux-stable-e14bd7e614b57493e1cbefb8a06d3754bdd04e26.zip
Docs: MSI-HOWTO: Insert a comma
Signed-off-by: Michael Witten <mfwitten@gmail.com> Acked-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/PCI/MSI-HOWTO.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt
index d9c8d989f2b3..c9cffaf16f82 100644
--- a/Documentation/PCI/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
@@ -231,7 +231,7 @@ mask or unmask an interrupt, it should call disable_irq() / enable_irq().
4.4 Handling devices implementing both MSI and MSI-X capabilities
If a device implements both MSI and MSI-X capabilities, it can
-run in either MSI mode or MSI-X mode but not both simultaneously.
+run in either MSI mode or MSI-X mode, but not both simultaneously.
This is a requirement of the PCI spec, and it is enforced by the
PCI layer. Calling pci_enable_msi() when MSI-X is already enabled or
pci_enable_msix() when MSI is already enabled results in an error.