From 08f1a209e437d97009a55fa233f3b00cfb072934 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 2 Mar 2012 16:18:30 +0000
Subject: [PATCH] --- yaml --- r: 293447 b: refs/heads/master c:
 2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a h: refs/heads/master i:   293445:
 d1ef71b5e6119f2aaf09fef56b2d7c07b249a1ad   293443:
 c3161f6169f07834fa5adb0d1765e78a156e0161   293439:
 fdd2721b299897b293a5c4a127ac2c805246be3e v: v3

---
 [refs]                        | 2 +-
 trunk/include/sound/soc-dai.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6890b1e0711a..25fb675082fb 100644
--- 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
index adb07fcd712c..c429f248cf4e 100644
--- 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;