Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 38ffc3fbcbe4..c06c667e9ca9 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -21,7 +21,7 @@
 #define MAX_BRIGHTNESS          (0xFF)
 #define MIN_BRIGHTNESS          (0)
 
-#define CURRENT_MASK            (0x1F << 1)
+#define CURRENT_BITMASK         (0x1F << 1)
 
 struct pm860x_backlight_data {
         struct pm860x_chip *chip;
@@ -85,7 +85,7 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
         if ((data->current_brightness == 0) && brightness) {
                 if (data->iset) {
                         ret = pm860x_set_bits(data->i2c, wled_idc(data->port),
-                                              CURRENT_MASK, data->iset);
+                                              CURRENT_BITMASK, data->iset);
                         if (ret < 0)
                                 goto out;
                 }