diff options
| author | Len Brown <len.brown@intel.com> | 2007-03-20 11:06:18 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-03-20 11:06:18 -0400 |
| commit | b25e84425ee21c5560fcaec15afcf58fe4a0a414 (patch) | |
| tree | ed4fff4a29e980a0b7ec984af6edc6c2cc5e8cfd /Documentation | |
| parent | f5ea908c8fca3921c1545e6ac52edbbb353640f5 (diff) | |
| parent | 09fe58356d148ff66901ddf639e725ca1a48a0af (diff) | |
| download | linux-b25e84425ee21c5560fcaec15afcf58fe4a0a414.tar.gz linux-b25e84425ee21c5560fcaec15afcf58fe4a0a414.tar.bz2 linux-b25e84425ee21c5560fcaec15afcf58fe4a0a414.zip | |
Pull bugzilla-7465 into release branch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 856c8b114e71..f0b7a5e5740a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -138,6 +138,12 @@ and is between 256 and 4096 characters. It is defined in the file See also Documentation/pm.txt, pci=noacpi + acpi_apic_instance= [ACPI, IOAPIC] + Format: <int> + 2: use 2nd APIC table, if available + 1,0: use 1st APIC table + default: 2 + acpi_sleep= [HW,ACPI] Sleep options Format: { s3_bios, s3_mode } See Documentation/power/video.txt |