diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /Documentation/MSI-HOWTO.txt | |
parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'Documentation/MSI-HOWTO.txt')
-rw-r--r-- | Documentation/MSI-HOWTO.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt index d389388c733..0d8240774fc 100644 --- a/Documentation/MSI-HOWTO.txt +++ b/Documentation/MSI-HOWTO.txt | |||
@@ -480,8 +480,8 @@ The PCI stack provides 3 possible levels of MSI disabling: | |||
480 | 480 | ||
481 | 6.1. Disabling MSI on a single device | 481 | 6.1. Disabling MSI on a single device |
482 | 482 | ||
483 | Under some circumstances, it might be required to disable MSI on a | 483 | Under some circumstances it might be required to disable MSI on a |
484 | single device, It may be achived by either not calling pci_enable_msi() | 484 | single device. This may be achieved by either not calling pci_enable_msi() |
485 | or all, or setting the pci_dev->no_msi flag before (most of the time | 485 | or all, or setting the pci_dev->no_msi flag before (most of the time |
486 | in a quirk). | 486 | in a quirk). |
487 | 487 | ||
@@ -492,7 +492,7 @@ being able to route MSI between busses. In this case, MSI have to be | |||
492 | disabled on all devices behind this bridge. It is achieves by setting | 492 | disabled on all devices behind this bridge. It is achieves by setting |
493 | the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge | 493 | the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge |
494 | subordinate bus. There is no need to set the same flag on bridges that | 494 | subordinate bus. There is no need to set the same flag on bridges that |
495 | are below the broken brigde. When pci_enable_msi() is called to enable | 495 | are below the broken bridge. When pci_enable_msi() is called to enable |
496 | MSI on a device, pci_msi_supported() takes care of checking the NO_MSI | 496 | MSI on a device, pci_msi_supported() takes care of checking the NO_MSI |
497 | flag in all parent busses of the device. | 497 | flag in all parent busses of the device. |
498 | 498 | ||