summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-09 23:19:50 -0500
committerLen Brown <len.brown@intel.com>2007-03-09 23:19:50 -0500
commit63e34ca93a62f472144db60fa3b81111c0d15721 (patch)
tree2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /Documentation
parent51e7fff1c2b763da910db3a875eac5b992df91d9 (diff)
parent9327f46ee28116b17f15f6505edd90f905908d62 (diff)
downloadlinux-63e34ca93a62f472144db60fa3b81111c0d15721.tar.bz2
Pull misc-for-upstream into release branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 914119309ddb..856c8b114e71 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -126,7 +126,8 @@ and is between 256 and 4096 characters. It is defined in the file
See header of drivers/scsi/53c7xx.c.
See also Documentation/scsi/ncr53c7xx.txt.
- acpi= [HW,ACPI] Advanced Configuration and Power Interface
+ acpi= [HW,ACPI,X86-64,i386]
+ Advanced Configuration and Power Interface
Format: { force | off | ht | strict | noirq }
force -- enable ACPI if default was off
off -- disable ACPI if default was on