diff options
author | Len Brown <len.brown@intel.com> | 2008-11-11 21:15:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:15:50 -0500 |
commit | f398778aa336a2919ee04ba45d915007230c6957 (patch) | |
tree | c7244cd1d4af8d99c861b21ebcaeabf23e355b9f /drivers/misc/asus-laptop.c | |
parent | 9b5a56ddfd615a27e3a0856ceae1592a24021e42 (diff) | |
parent | 2dba1b5d87e08a294da5cdfa4d32908000e9b085 (diff) |
Merge branch 'video' into release
Conflicts:
Documentation/kernel-parameters.txt
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/asus-laptop.c')
-rw-r--r-- | drivers/misc/asus-laptop.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index a9d5228724a..8fb8b359104 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -1208,9 +1208,13 @@ static int __init asus_laptop_init(void) dev = acpi_get_physical_device(hotk->device->handle); - result = asus_backlight_init(dev); - if (result) - goto fail_backlight; + if (!acpi_video_backlight_support()) { + result = asus_backlight_init(dev); + if (result) + goto fail_backlight; + } else + printk(ASUS_INFO "Brightness ignored, must be controlled by " + "ACPI video driver\n"); result = asus_led_init(dev); if (result) |