aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 533e67febf81..650b0d8aa89b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file
138 strict -- Be less tolerant of platforms that are not 138 strict -- Be less tolerant of platforms that are not
139 strictly ACPI specification compliant. 139 strictly ACPI specification compliant.
140 140
141 See also Documentation/pm.txt, pci=noacpi 141 See also Documentation/power/pm.txt, pci=noacpi
142 142
143 acpi_apic_instance= [ACPI, IOAPIC] 143 acpi_apic_instance= [ACPI, IOAPIC]
144 Format: <int> 144 Format: <int>
@@ -177,9 +177,6 @@ and is between 256 and 4096 characters. It is defined in the file
177 177
178 acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT 178 acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT
179 179
180 acpi_no_initrd_override [KNL,ACPI]
181 Disable loading custom ACPI tables from the initramfs
182
183 acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS 180 acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
184 Format: To spoof as Windows 98: ="Microsoft Windows" 181 Format: To spoof as Windows 98: ="Microsoft Windows"
185 182
@@ -735,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file
735 (Don't attempt to blink the leds) 732 (Don't attempt to blink the leds)
736 i8042.noaux [HW] Don't check for auxiliary (== mouse) port 733 i8042.noaux [HW] Don't check for auxiliary (== mouse) port
737 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
738 i8042.nomux [HW] Don't check presence of an active multiplexing 737 i8042.nomux [HW] Don't check presence of an active multiplexing
739 controller 738 controller
740 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