From e8e0d794cee99ccf99451dbc8c2891de1731e1ca Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 13 Nov 2012 09:28:54 +0100
Subject: [PATCH] --- yaml --- r: 345023 b: refs/heads/master c:
 d640e757949e2991215838c0edbfd6afc37e5b06 h: refs/heads/master i:   345021:
 f3ebee84f5170a5835905b75b6c2a0e1fcee689b   345019:
 44258c814c183c2171f9090f9dcca5ec70e5ddea   345015:
 1af5393c0a0292265fa2a7ae9fa82e70b1fda649   345007:
 7cf362760dc45ba26e55214690a3cc0021085071   344991:
 71c2145082a5604357a11784113ee7ed0c7b72fe   344959:
 800b5bb8041493ac3a58baeb711b5846cce737d8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/mfd/twl-core.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6fd42308195e..0421a2ba9f00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fbc6420b730f32d0088103da0877981da67df39
+refs/heads/master: d640e757949e2991215838c0edbfd6afc37e5b06
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index f857097aca5c..43c7b4c92940 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -1077,8 +1077,8 @@ static inline int __init protect_pm_master(void)
 {
 	int e = 0;
 
-	e = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0,
-			TWL4030_PM_MASTER_PROTECT_KEY);
+	e = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, 0,
+			     TWL4030_PM_MASTER_PROTECT_KEY);
 	return e;
 }
 
@@ -1086,12 +1086,10 @@ static inline int __init unprotect_pm_master(void)
 {
 	int e = 0;
 
-	e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
-			TWL4030_PM_MASTER_KEY_CFG1,
-			TWL4030_PM_MASTER_PROTECT_KEY);
-	e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
-			TWL4030_PM_MASTER_KEY_CFG2,
-			TWL4030_PM_MASTER_PROTECT_KEY);
+	e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG1,
+			      TWL4030_PM_MASTER_PROTECT_KEY);
+	e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG2,
+			      TWL4030_PM_MASTER_PROTECT_KEY);
 
 	return e;
 }