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)