From 9e7da08de8b88570bf71357103d46784507d3a95 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Fri, 1 Aug 2008 17:37:56 +0200
Subject: [PATCH] --- yaml --- r: 118813 b: refs/heads/master c:
 febf2d95a71cd594182e4b3defb0e0ffdfe61482 h: refs/heads/master i:   118811:
 b6b771c18c74c07a9442f04ce25f24929bddf71f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/misc/acer-wmi.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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;