diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
| commit | 81e242d0efafb319938d511b115088a5c4523c91 (patch) | |
| tree | be22aa41db2288fd7999524d719f333c766a367f /Documentation/kernel-parameters.txt | |
| parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
| parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8ea41b6e6a85..0dcbd266b442 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -177,6 +177,9 @@ 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 | |||
| 180 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | 183 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS |
| 181 | Format: To spoof as Windows 98: ="Microsoft Windows" | 184 | Format: To spoof as Windows 98: ="Microsoft Windows" |
| 182 | 185 | ||