diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2009-09-15 13:06:02 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2009-09-17 09:47:27 +0200 |
| commit | c82693317e4a34b2b3ed4220c6fca3e99a75b045 (patch) | |
| tree | 27eea78abc20e5625e73baf314289ea32000f6f8 | |
| parent | d619bc143e311a738113dbbe7792bd032403939f (diff) | |
| download | linux-stable-c82693317e4a34b2b3ed4220c6fca3e99a75b045.tar.gz linux-stable-c82693317e4a34b2b3ed4220c6fca3e99a75b045.tar.bz2 linux-stable-c82693317e4a34b2b3ed4220c6fca3e99a75b045.zip | |
mfd: Fix twl4030-power warnings
KEY_1 and KEY_2 definitions conflicts with include/linux/input.h
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/twl4030-power.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 5284c7c169a5..d423e0c4176b 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -64,8 +64,8 @@ static u8 twl4030_start_script_address = 0x2b; #define R_MEMORY_DATA PHY_TO_OFF_PM_MASTER(0x5a) #define R_PROTECT_KEY 0x0E -#define KEY_1 0xC0 -#define KEY_2 0x0C +#define R_KEY_1 0xC0 +#define R_KEY_2 0x0C /* resource configuration registers */ @@ -424,12 +424,12 @@ void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts) struct twl4030_resconfig *resconfig; u8 address = twl4030_start_script_address; - err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_1, + err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1, R_PROTECT_KEY); if (err) goto unlock; - err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_2, + err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2, R_PROTECT_KEY); if (err) goto unlock; |