Commit 2550326a authored Jan 20, 2011 by Randy Dunlap Committed by Linus Torvalds Jan 20, 2011

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>

parent cc587ece

drivers/video/backlight/88pm860x_bl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}