From 468fc948cf9d13a911701a5acfec5ef3db163569 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Fri, 1 Aug 2008 17:37:58 +0200
Subject: [PATCH] --- yaml --- r: 118815 b: refs/heads/master c:
 29454f17124c655236d2972dad21907e15ca294b h: refs/heads/master i:   118813:
 9e7da08de8b88570bf71357103d46784507d3a95   118811:
 b6b771c18c74c07a9442f04ce25f24929bddf71f   118807:
 339dc08ab9cdfdabd565f302eee2bc28e416ce34   118799:
 c11f0aaf62a9e1fad73f630409b003213b1c0e4a   118783:
 e9cfd9d0e9c7c1ce7a6051b7a72d180d1d5e5070 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/misc/compal-laptop.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5205fd7d9748..d1ffcc0731b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6766fec3669d5053b987e111afb348b885237bfc
+refs/heads/master: 29454f17124c655236d2972dad21907e15ca294b
diff --git a/trunk/drivers/misc/compal-laptop.c b/trunk/drivers/misc/compal-laptop.c
index 344b790a6253..11003bba10d3 100644
--- a/trunk/drivers/misc/compal-laptop.c
+++ b/trunk/drivers/misc/compal-laptop.c
@@ -326,12 +326,14 @@ static int __init compal_init(void)
 
 	/* Register backlight stuff */
 
-	compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
-						&compalbl_ops);
-	if (IS_ERR(compalbl_device))
-		return PTR_ERR(compalbl_device);
+	if (!acpi_video_backlight_support()) {
+		compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
+							    &compalbl_ops);
+		if (IS_ERR(compalbl_device))
+			return PTR_ERR(compalbl_device);
 
-	compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+		compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+	}
 
 	ret = platform_driver_register(&compal_driver);
 	if (ret)