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/msi-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/msi-laptop.c')
| -rw-r--r-- | drivers/misc/msi-laptop.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c index de898c6938f3..759763d18e4c 100644 --- a/drivers/misc/msi-laptop.c +++ b/drivers/misc/msi-laptop.c @@ -347,12 +347,16 @@ static int __init msi_init(void) /* Register backlight stuff */ - msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL, - &msibl_ops); - if (IS_ERR(msibl_device)) - return PTR_ERR(msibl_device); - - msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1; + if (acpi_video_backlight_support()) { + printk(KERN_INFO "MSI: Brightness ignored, must be controlled " + "by ACPI video driver\n"); + } else { + msibl_device = backlight_device_register("msi-laptop-bl", NULL, + NULL, &msibl_ops); + if (IS_ERR(msibl_device)) + return PTR_ERR(msibl_device); + msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1; + } ret = platform_driver_register(&msipf_driver); if (ret) |