import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 96401631523d26787c9e03ef8938bd08bd8c8d9f..2082e5bd08cb01c02db8f8b687adde571153c909 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1458,6 +1458,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                        * atapi_dmadir: Enable ATAPI DMADIR bridge support
 
+                       * disable: Disable this device.
+
                        If there are multiple matching configurations changing
                        the same attribute, the last one is used.
 
@@ -3215,6 +3217,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        HIGHMEM regardless of setting
                                        of CONFIG_HIGHPTE.
 
+       uuid_debug=     (Boolean) whether to enable debugging of TuxOnIce's
+                       uuid support.
+
        vdso=           [X86,SH]
                        vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                        vdso=1: enable VDSO (default)