diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 622f7849edb9..508e2a2c9864 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -732,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
732 | (Don't attempt to blink the leds) | 732 | (Don't attempt to blink the leds) |
733 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port | 733 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port |
734 | i8042.nokbd [HW] Don't check/create keyboard port | 734 | i8042.nokbd [HW] Don't check/create keyboard port |
735 | i8042.noloop [HW] Disable the AUX Loopback command while probing | ||
736 | for the AUX port | ||
735 | i8042.nomux [HW] Don't check presence of an active multiplexing | 737 | i8042.nomux [HW] Don't check presence of an active multiplexing |
736 | controller | 738 | controller |
737 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX | 739 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX |
@@ -1128,6 +1130,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1128 | memmap=nn[KMG]$ss[KMG] | 1130 | memmap=nn[KMG]$ss[KMG] |
1129 | [KNL,ACPI] Mark specific memory as reserved. | 1131 | [KNL,ACPI] Mark specific memory as reserved. |
1130 | Region of memory to be used, from ss to ss+nn. | 1132 | Region of memory to be used, from ss to ss+nn. |
1133 | Example: Exclude memory from 0x18690000-0x1869ffff | ||
1134 | memmap=64K$0x18690000 | ||
1135 | or | ||
1136 | memmap=0x10000$0x18690000 | ||
1131 | 1137 | ||
1132 | meye.*= [HW] Set MotionEye Camera parameters | 1138 | meye.*= [HW] Set MotionEye Camera parameters |
1133 | See Documentation/video4linux/meye.txt. | 1139 | See Documentation/video4linux/meye.txt. |