mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Henrik Kretzschmar <henne@nachtwindheim.de>
To: rpurdie@rpsys.net
Cc: sameo@linux.intel.com, mjg@redhat.com, henne@nachtwindheim.de,
	error27@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH] backlight: 88pm860x_bl: fix build failure
Date: Fri, 20 Aug 2010 20:01:55 +0200	[thread overview]
Message-ID: <1282327315-5259-1-git-send-email-henne@nachtwindheim.de> (raw)

On x86_64 system this driver fails to build, since theres already a
macro called CURRENT_MASK in arch/asm/include/page_64_types.h
So I renamed this macro to BL_CURRENT_MASK to aviod a collision.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
This patch is against Linux tree and tested.

 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 38ffc3f..68bd602 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 BL_CURRENT_MASK		(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);
+					      BL_CURRENT_MASK, data->iset);
 			if (ret < 0)
 				goto out;
 		}
-- 
1.7.0.4


             reply	other threads:[~2010-08-20 18:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-20 18:01 Henrik Kretzschmar [this message]
2010-08-20 18:27 ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1282327315-5259-1-git-send-email-henne@nachtwindheim.de \
    --to=henne@nachtwindheim.de \
    --cc=error27@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg@redhat.com \
    --cc=rpurdie@rpsys.net \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®