diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-03-02 15:51:48 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-03-02 15:51:48 +0100 |
| commit | a58db59a263d4232710af816f3857254b5823633 (patch) | |
| tree | 977120471e3d34412d2c810c48d0fe2b9547ffc7 /Documentation | |
| parent | classmate-laptop: Added some keys present in other devices (diff) | |
| parent | thinkpad-acpi: fix ALSA callback return status (diff) | |
| download | linux-a58db59a263d4232710af816f3857254b5823633.tar.xz linux-a58db59a263d4232710af816f3857254b5823633.zip | |
Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into x86-platform
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 75afa1229fd7..39c0a09d0105 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -650,6 +650,10 @@ LCD, CRT or DVI (if available). The following commands are available: echo expand_toggle > /proc/acpi/ibm/video echo video_switch > /proc/acpi/ibm/video +NOTE: Access to this feature is restricted to processes owning the +CAP_SYS_ADMIN capability for safety reasons, as it can interact badly +enough with some versions of X.org to crash it. + Each video output device can be enabled or disabled individually. Reading /proc/acpi/ibm/video shows the status of each device. |