Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

[platform/adaptation/renesas_rcar/renesas_kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 58eac23..e2f8c29 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1869,6 +1869,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        shutdown the other cpus.  Instead use the REBOOT_VECTOR
                        irq.
 
+       nomodule        Disable module load
+
        nopat           [X86] Disable PAT (page attribute table extension of
                        pagetables) support.