From 9ebddd423785818cfee9b0a6ac92c689395a5144 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber@corscience.de>
Date: Mon, 5 Sep 2011 11:26:33 +0200
Subject: [PATCH] --- yaml --- r: 273394 b: refs/heads/master c:
 f09ee0451a44a4e913a7c3cec3805508f7de6c54 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d2ce9565b66b..e8774f650b0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0a8e8e42a4e30a1fc4c40205fa790e264d00f3
+refs/heads/master: f09ee0451a44a4e913a7c3cec3805508f7de6c54
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index 01ecfeee6524..b8eef462737a 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -109,7 +109,7 @@
 #define twl_has_watchdog()        false
 #endif
 
-#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
+#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
 	defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE)
 #define twl_has_codec()	true
 #else