diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 09:37:48 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 09:37:48 +0100 |
| commit | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch) | |
| tree | ef45618ae057e21fff7c82190939fe5f4466cf06 /Documentation | |
| parent | Merge branch 'fujitsu-laptop' into release (diff) | |
| parent | ACPI : Use RSDT instead of XSDT by adding boot option of "acpi=rsdt" (diff) | |
| download | linux-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.tar.xz linux-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.zip | |
Merge branch 'misc' into release
Conflicts:
include/acpi/acpixf.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c9115c1b672c..136f02842de9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -139,6 +139,7 @@ and is between 256 and 4096 characters. It is defined in the file 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 See also Documentation/power/pm.txt, pci=noacpi |