---

yaml --- r: 293447 b: refs/heads/master c: 2466ab9 h: refs/heads/master i: 293445: d1ef71b 293443: c3161f6 293439: fdd2721 v: v3
git-mirror · Mar 4, 2012 · 08f1a20 · 08f1a20
1 parent 77f0f54
commit 08f1a20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bdd47997f110ee06ed8a1c6668d12106936ba12
+refs/heads/master: 2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a
diff --git a/trunk/include/sound/soc-dai.h b/trunk/include/sound/soc-dai.h
@@ -250,10 +250,9 @@ struct snd_soc_dai {
 	unsigned int rate;
 
 	/* parent platform/codec */
-	union {
-		struct snd_soc_platform *platform;
-		struct snd_soc_codec *codec;
-	};
+	struct snd_soc_platform *platform;
+	struct snd_soc_codec *codec;
+
 	struct snd_soc_card *card;
 
 	struct list_head list;