summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-28 16:20:35 -0400
committerLen Brown <len.brown@intel.com>2010-05-28 16:20:35 -0400
commitd3b383338f105f50724c10a7d81b04a3930e886b (patch)
tree73c55f260136aa0f24571c1307a432caca4f0349 /Documentation
parentedbe77ba94217868caf5f391d2a083729bef3742 (diff)
parent68ca406930d6380b3be7ada5f15fcf85bfcbd552 (diff)
downloadlinux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.gz
linux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.bz2
linux-d3b383338f105f50724c10a7d81b04a3930e886b.zip
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 42d77735fd45..ca575f702cf2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -143,11 +143,10 @@ and is between 256 and 4096 characters. It is defined in the file
acpi= [HW,ACPI,X86]
Advanced Configuration and Power Interface
- Format: { force | off | ht | strict | noirq | rsdt }
+ Format: { force | off | strict | noirq | rsdt }
force -- enable ACPI if default was off
off -- disable ACPI if default was on
noirq -- do not use ACPI for IRQ routing
- ht -- run only enough ACPI to enable Hyper Threading
strict -- Be less tolerant of platforms that are not
strictly ACPI specification compliant.
rsdt -- prefer RSDT over (default) XSDT