diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
| commit | a7f4463e0300b5135c0f0caf7c34a0529405f986 (patch) | |
| tree | 8df5f13094778eff3c8653bcc249cd265378b80a /Documentation/kernel-parameters.txt | |
| parent | c478f8786973d6d7552c652ddad3f6fd86b5af28 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index fc22e9223427..4a7700876c96 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -135,7 +135,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 135 | 135 | ||
| 136 | acpi= [HW,ACPI,X86-64,i386] | 136 | acpi= [HW,ACPI,X86-64,i386] |
| 137 | Advanced Configuration and Power Interface | 137 | Advanced Configuration and Power Interface |
| 138 | Format: { force | off | ht | strict | noirq } | 138 | Format: { force | off | ht | strict | noirq | rsdt } |
| 139 | force -- enable ACPI if default was off | 139 | force -- enable ACPI if default was off |
| 140 | off -- disable ACPI if default was on | 140 | off -- disable ACPI if default was on |
| 141 | noirq -- do not use ACPI for IRQ routing | 141 | noirq -- do not use ACPI for IRQ routing |