summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-08-18 11:08:22 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-08-18 11:08:22 +1000
commitef41fa33e776eaff466bc4158276d5df5fe937f2 (patch)
tree26ed67d0f652c2a476d748ae693d8925f6db3659 /Documentation
parent3f84e346d8249fb41e007c8f2551cedfb545375e (diff)
parent35989e9d7e19deb4b395aee7d120b1536337b4af (diff)
Merge remote branch 'drivers-x86/linux-next'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/laptops/thinkpad-acpi.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index f6f80257addb..1565eefd6fd5 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -1024,6 +1024,10 @@ ThinkPad-specific interface. The driver will disable its native
backlight brightness control interface if it detects that the standard
ACPI interface is available in the ThinkPad.
+If you want to use the thinkpad-acpi backlight brightness control
+instead of the generic ACPI video backlight brightness control for some
+reason, you should use the acpi_backlight=vendor kernel parameter.
+
The brightness_enable module parameter can be used to control whether
the LCD brightness control feature will be enabled when available.
brightness_enable=0 forces it to be disabled. brightness_enable=1