backlight: fix 88pm860x_bl macro collision
authorRandy Dunlap <randy.dunlap@oracle.com>
Thu, 20 Jan 2011 22:44:31 +0000 (14:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 22:47:22 +0000 (14:47 -0800)
commit4e3e37b58d6cba97d9d9f5d9532d587030fcc648
tree5eaedf416b3120638481a8705cc0bde8305861c9
parent49aaedcac826772e1054c8a5ec9fb9d0af45df8c
backlight: fix 88pm860x_bl macro collision

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