diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-01-20 14:44:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 17:02:06 -0800 |
| commit | 2550326ac7a062fdfc204f9a3b98bdb9179638fc (patch) | |
| tree | 4874985744f0fcf2e725e8f3a256c91bd80743de /drivers | |
| parent | cc587ece12791d001095488bf060fac52f657ea9 (diff) | |
| download | linux-3.10-2550326ac7a062fdfc204f9a3b98bdb9179638fc.tar.gz linux-3.10-2550326ac7a062fdfc204f9a3b98bdb9179638fc.tar.bz2 linux-3.10-2550326ac7a062fdfc204f9a3b98bdb9179638fc.zip | |
backlight: fix 88pm860x_bl macro collision
Fix collision with kernel-supplied #define:
drivers/video/backlight/88pm860x_bl.c:24:1: warning: "CURRENT_MASK" redefined
arch/x86/include/asm/page_64_types.h:6:1: warning: this is the location of the previous definition
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/backlight/88pm860x_bl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index c789c46e38a..b224396b86d 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; } |