diff options
| author | Thomas Renninger <trenn@suse.de> | 2008-08-01 17:37:59 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-08 00:27:27 -0500 |
| commit | a2bf8c01048f855fbf65a8fc41460aef71ca39dc (patch) | |
| tree | 39c82213281dd31dcb0c7206d98c18e279cb19cf /drivers/misc | |
| parent | 29454f17124c655236d2972dad21907e15ca294b (diff) | |
| download | linux-stable-a2bf8c01048f855fbf65a8fc41460aef71ca39dc.tar.gz linux-stable-a2bf8c01048f855fbf65a8fc41460aef71ca39dc.tar.bz2 linux-stable-a2bf8c01048f855fbf65a8fc41460aef71ca39dc.zip | |
eeepc-laptop: fingers off backlight if video.ko is serving this functionality
Signed-off-by: Thomas Renninger <trenn@suse.de>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/eeepc-laptop.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c index 9ef98b2d5039..02fe2b8b8939 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c @@ -825,9 +825,15 @@ static int __init eeepc_laptop_init(void) return -ENODEV; } dev = acpi_get_physical_device(ehotk->device->handle); - result = eeepc_backlight_init(dev); - if (result) - goto fail_backlight; + + if (!acpi_video_backlight_support()) { + result = eeepc_backlight_init(dev); + if (result) + goto fail_backlight; + } else + printk(EEEPC_INFO "Backlight controlled by ACPI video " + "driver\n"); + result = eeepc_hwmon_init(dev); if (result) goto fail_hwmon; |