Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f1959b7d13d0eaf9dff13a07ca9e621d23ba9076..b40b413db88e2aeea1f19f2200dbf6049da36206 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -397,8 +397,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        atkbd.softrepeat= [HW]
                        Use software keyboard repeat
 
-       autotest        [IA-64]
-
        baycom_epp=     [HW,AX25]
                        Format: <io>,<mode>
 
@@ -1453,8 +1451,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        devices can be requested on-demand with the
                        /dev/loop-control interface.
 
-       mcatest=        [IA-64]
-
        mce             [X86-32] Machine Check Exception
 
        mce=option      [X86-64] See Documentation/x86/x86_64/boot-options.txt