Merge branch 'for-2.6.29' into for-2.6.30

1 files changed, 8 insertions, 1 deletions

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 502766dce861..6f9e6beabb14 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1436,7 +1436,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
 },
 };
 
-struct snd_soc_dai wm8753_dai[2];
+struct snd_soc_dai wm8753_dai[] = {
+        {
+                .name = "WM8753 DAI 0",
+        },
+        {
+                .name = "WM8753 DAI 1",
+        },
+};
 EXPORT_SYMBOL_GPL(wm8753_dai);
 
 static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)