summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2007-03-06 02:29:44 -0800
committerLen Brown <len.brown@intel.com>2007-03-07 03:09:10 -0500
commit03d926f82800f32642b32ba547c7a002a371a78f (patch)
tree5a01fac63ef880445d78e58b074d4e554b5282b7 /Documentation
parent8607c673bdd593d4ce439a36412a213a8efb282b (diff)
downloadlinux-03d926f82800f32642b32ba547c7a002a371a78f.tar.bz2
ACPI: Add kernel-parameters hint that acpi=off doesn't work on IA64.
Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
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 6e92ba61f7c0..7702e3d397bb 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -125,7 +125,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