summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-06-02 01:02:09 -0400
committerLen Brown <len.brown@intel.com>2007-06-02 01:02:09 -0400
commitc4d36a822e7c51cd6ffcf9133854d5e32489d269 (patch)
tree4c1f8d3f18fd03cb5763520c90b8b9c7c11510b3 /Documentation
parentfcf75356e9cf0460ef47a5b756bc3b0951ecab59 (diff)
parentdd272b5716a54afa33a69f2241284d8ec60b7892 (diff)
downloadlinux-c4d36a822e7c51cd6ffcf9133854d5e32489d269.tar.gz
linux-c4d36a822e7c51cd6ffcf9133854d5e32489d269.tar.bz2
linux-c4d36a822e7c51cd6ffcf9133854d5e32489d269.zip
Pull osi-now into release branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ce91560229f5..5d0283cd3a81 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -170,7 +170,10 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
Format: To spoof as Windows 98: ="Microsoft Windows"
- acpi_osi= [HW,ACPI] empty param disables _OSI
+ acpi_osi= [HW,ACPI] Modify list of supported OS interface strings
+ acpi_osi="string1" # add string1 -- only one string
+ acpi_osi="!string2" # remove built-in string2
+ acpi_osi= # disable all strings
acpi_serialize [HW,ACPI] force serialization of AML methods