summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-20 08:48:28 +0400
committerJeff Garzik <jeff@garzik.org>2006-09-20 08:48:28 +0400
commit783c99f42e221217761e9c319838d5533107f7cb (patch)
treeff09cb67fc0875450e83906af887fe219bc99c53 /Documentation
parentf8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (diff)
parente478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff)
downloadlinux-783c99f42e221217761e9c319838d5533107f7cb.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
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.
Mechanism 2.
nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI
Configuration
- mmconf [IA-32,X86_64] Force MMCONFIG. This is useful
- to override the builtin blacklist.
nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide.