mfd: Fix twl4030-power warnings
authorSamuel Ortiz <sameo@linux.intel.com>
Tue, 15 Sep 2009 11:06:02 +0000 (13:06 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 17 Sep 2009 07:47:27 +0000 (09:47 +0200)
KEY_1 and KEY_2 definitions conflicts with include/linux/input.h

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/twl4030-power.c

Simple merge