tree 4874985744f0fcf2e725e8f3a256c91bd80743de
parent cc587ece12791d001095488bf060fac52f657ea9
author Randy Dunlap <randy.dunlap@oracle.com> 1295563471 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295571726 -0800

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>