From 4eaa362ecb505e2aa2baf7654d9d7f66a07bda7d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 10 May 2012 10:33:02 +0300
Subject: [PATCH] --- yaml --- r: 307395 b: refs/heads/master c:
 fcf92202e7bc2e8513ae045e3ec61e79c1c9e690 h: refs/heads/master i:   307393:
 a4361e60e6f2c84a38da805c6ec2450b5c660d7e   307391:
 176b22ed3473be832db9653668431e984ccac288 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/gpu/drm/gma500/opregion.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aeb7fc332ea6..7ccea0184f9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce0679136678a58cbeca40acd84b6a0462637454
+refs/heads/master: fcf92202e7bc2e8513ae045e3ec61e79c1c9e690
diff --git a/trunk/drivers/gpu/drm/gma500/opregion.c b/trunk/drivers/gpu/drm/gma500/opregion.c
index aa9e89f7e4c2..4f186eca3a30 100644
--- a/trunk/drivers/gpu/drm/gma500/opregion.c
+++ b/trunk/drivers/gpu/drm/gma500/opregion.c
@@ -149,7 +149,6 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	struct opregion_asle *asle = dev_priv->opregion.asle;
 	struct backlight_device *bd = dev_priv->backlight_device;
-	u32 max;
 
 	DRM_DEBUG_DRIVER("asle set backlight %x\n", bclp);
 
@@ -163,11 +162,12 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
 	if (bclp > 255)
 		return ASLE_BACKLIGHT_FAILED;
 
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-	max = bd->props.max_brightness;
-	bd->props.brightness = bclp * max / 255;
-	backlight_update_status(bd);
-#endif
+	if (config_enabled(CONFIG_BACKLIGHT_CLASS_DEVICE)) {
+		int max = bd->props.max_brightness;
+		bd->props.brightness = bclp * max / 255;
+		backlight_update_status(bd);
+	}
+
 	asle->cblv = (bclp * 0x64) / 0xff | ASLE_CBLV_VALID;
 
 	return 0;