From 60ee54a87cd2cb8f5b13db2d0e5e1869becdc7b8 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 15 Sep 2009 13:06:02 +0200
Subject: [PATCH] --- yaml --- r: 163277 b: refs/heads/master c:
 c82693317e4a34b2b3ed4220c6fca3e99a75b045 h: refs/heads/master i:   163275:
 1d91e63df0dc502c090d7df149ed2d6fa5f351f1 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mfd/twl4030-power.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a7fc6dc60823..66ae8cd8034b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d619bc143e311a738113dbbe7792bd032403939f
+refs/heads/master: c82693317e4a34b2b3ed4220c6fca3e99a75b045
diff --git a/trunk/drivers/mfd/twl4030-power.c b/trunk/drivers/mfd/twl4030-power.c
index 5284c7c169a5..d423e0c4176b 100644
--- a/trunk/drivers/mfd/twl4030-power.c
+++ b/trunk/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;