---

yaml --- r: 273394 b: refs/heads/master c: f09ee04 h: refs/heads/master v: v3
git-mirror · Oct 24, 2011 · 9ebddd4 · 9ebddd4
1 parent 7b0696a
commit 9ebddd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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