lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 136/176] backlight: fix 88pm860x_bl macro collision
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Randy Dunlap <randy.dunlap@oracle.com>

    commit 2550326ac7a062fdfc204f9a3b98bdb9179638fc upstream.

    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>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/video/backlight/88pm860x_bl.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- 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 b
    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;
    }



    \
     
     \ /
      Last update: 2011-02-16 02:03    [W:0.025 / U:0.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site