diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:10 -0500 |
| commit | 9e0c20bceb611917a7546172ac617d07e5af0cfa (patch) | |
| tree | 961e9397fd1d913d2f0d5cd88fb05a70b68d955d /Documentation | |
| parent | fe3ded5078e957d80c43837e1966429cf0029c10 (diff) | |
| parent | 82069552555cf951d9ade5c1aec61dd40b0765b5 (diff) | |
| download | linux-stable-9e0c20bceb611917a7546172ac617d07e5af0cfa.tar.gz linux-stable-9e0c20bceb611917a7546172ac617d07e5af0cfa.tar.bz2 linux-stable-9e0c20bceb611917a7546172ac617d07e5af0cfa.zip | |
Merge branch 'acpi-video' into release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 01ece1b9213e..9d27030ecd0b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -199,11 +199,6 @@ and is between 256 and 4096 characters. It is defined in the file unusable. The "log_buf_len" parameter may be useful if you need to capture more output. - acpi_display_output= [HW,ACPI] - acpi_display_output=vendor - acpi_display_output=video - See above. - acpi_irq_balance [HW,ACPI] ACPI will balance active IRQs default in APIC mode |