Merge branch 'master' into for-next

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 22303b2e74bc9def14d48d27889b9d58769490dd..a9d780e5d8a863d864ae9b678e61f5162fb6adc6 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1625,7 +1625,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        module.sig_enforce
                        [KNL] When CONFIG_MODULE_SIG is set, this means that
                        modules without (valid) signatures will fail to load.
-                       Note that if CONFIG_MODULE_SIG_ENFORCE is set, that
+                       Note that if CONFIG_MODULE_SIG_FORCE is set, that
                        is always true, so this option does nothing.
 
        mousedev.tap_time=
@@ -1974,8 +1974,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                        with UP alternatives
 
-       noresidual      [PPC] Don't use residual data on PReP machines.
-
        nordrand        [X86] Disable the direct use of the RDRAND
                        instruction even if it is supported by the
                        processor.  RDRAND is still available to user