diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-20 00:48:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-20 00:48:28 -0400 |
| commit | 783c99f42e221217761e9c319838d5533107f7cb (patch) | |
| tree | ff09cb67fc0875450e83906af887fe219bc99c53 /Documentation | |
| parent | f8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 87a17337c7f6..71d05f481727 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1189,8 +1189,6 @@ running once the system is up. | |||
| 1189 | Mechanism 2. | 1189 | Mechanism 2. |
| 1190 | nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI | 1190 | nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI |
| 1191 | Configuration | 1191 | Configuration |
| 1192 | mmconf [IA-32,X86_64] Force MMCONFIG. This is useful | ||
| 1193 | to override the builtin blacklist. | ||
| 1194 | nomsi [MSI] If the PCI_MSI kernel config parameter is | 1192 | nomsi [MSI] If the PCI_MSI kernel config parameter is |
| 1195 | enabled, this kernel boot option can be used to | 1193 | enabled, this kernel boot option can be used to |
| 1196 | disable the use of MSI interrupts system-wide. | 1194 | disable the use of MSI interrupts system-wide. |