From 46865a04a101ac715be8797d90fb2d8a253a60ad Mon Sep 17 00:00:00 2001
From: "Olaya, Margarita" <magi.olaya@ti.com>
Date: Wed, 17 Mar 2010 17:42:29 -0500
Subject: [PATCH] --- yaml --- r: 193353 b: refs/heads/master c:
 6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0 h: refs/heads/master i:   193351:
 035f064c3797cff1b4474edc22886c65cb58d483 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mfd/twl-core.c  | 4 ++--
 trunk/include/linux/i2c/twl.h | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bfc0409db648..c5713f329191 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4bee1bb0083869b1b7d73c6eda7703a7aae0506
+refs/heads/master: 6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index 562cd4935e17..720e099e506d 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -109,7 +109,7 @@
 #endif
 
 #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
-	defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE)
+	defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
 #define twl_has_codec()	true
 #else
 #define twl_has_codec()	false
@@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
 	/* Phoenix*/
 	if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
 		sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
-		child = add_child(sub_chip_id, "twl6030_codec",
+		child = add_child(sub_chip_id, "twl6040_codec",
 				pdata->codec, sizeof(*pdata->codec),
 				false, 0, 0);
 		if (IS_ERR(child))
diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h
index fb6784e86d5f..ebd90ce58ca2 100644
--- a/trunk/include/linux/i2c/twl.h
+++ b/trunk/include/linux/i2c/twl.h
@@ -569,9 +569,9 @@ struct twl4030_codec_data {
 	struct twl4030_codec_audio_data		*audio;
 	struct twl4030_codec_vibra_data		*vibra;
 
-	/* twl6030 */
-	int audpwron_gpio;      /* audio power-on gpio */
-	int naudint_irq;        /* audio interrupt */
+	/* twl6040 */
+	int audpwron_gpio;	/* audio power-on gpio */
+	int naudint_irq;	/* audio interrupt */
 };
 
 struct twl4030_platform_data {