Merge commit 'v2.6.28-rc8' into x86/doc

[linux-2.6-omap-h63xx.git] / drivers / misc / msi-laptop.c

diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index 83679c7629253b2ed0b4b106ea0e17e3073ef0df..759763d18e4c969beac31717a949a7de2c20fa29 100644 (file)
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -58,7 +58,6 @@
 #include <linux/dmi.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
-#include <linux/autoconf.h>
 
 #define MSI_DRIVER_VERSION "0.5"
 
@@ -348,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)