matroxfb: make CONFIG_FB_MATROX_MULTIHEAD=y mandatory

[safe/jmp/linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f45d0d8..c363840 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -933,7 +933,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        1 -- enable informational integrity auditing messages.
 
        ima_hash=       [IMA]
-                       Formt: { "sha1" | "md5" }
+                       Format: { "sha1" | "md5" }
                        default: "sha1"
 
        ima_tcb         [IMA]
@@ -1565,7 +1565,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
 
-       nmi_debug=      [KNL,AVR32] Specify one or more actions to take
+       nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]