---

yaml --- r: 263030 b: refs/heads/master c: e14bd7e h: refs/heads/master v: v3
git-mirror · Aug 2, 2011 · c89d19a · c89d19a
1 parent fb752c1
commit c89d19a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6ffceb0ded9beeaddd9c246b3fec298c6b1f0c9
+refs/heads/master: e14bd7e614b57493e1cbefb8a06d3754bdd04e26
diff --git a/trunk/Documentation/PCI/MSI-HOWTO.txt b/trunk/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.