diff --git a/[refs] b/[refs]
index 99f17d4689d2..a9a2b83b404e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d6de698c84efdbdd3781b7058bcc339ab43da8
+refs/heads/master: febf2d95a71cd594182e4b3defb0e0ffdfe61482
diff --git a/trunk/drivers/misc/acer-wmi.c b/trunk/drivers/misc/acer-wmi.c
index 0532a2de2ce4..94c9f911824e 100644
--- a/trunk/drivers/misc/acer-wmi.c
+++ b/trunk/drivers/misc/acer-wmi.c
@@ -1297,6 +1297,12 @@ static int __init acer_wmi_init(void)
 
 	set_quirks();
 
+	if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
+		interface->capability &= ~ACER_CAP_BRIGHTNESS;
+		printk(ACER_INFO "Brightness must be controlled by "
+		       "generic video driver\n");
+	}
+
 	if (platform_driver_register(&acer_platform_driver)) {
 		printk(ACER_ERR "Unable to register platform driver.\n");
 		goto error_platform_register;