Merge commit 'v3.4-rc4' into next

1 files changed, 7 insertions, 4 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 2413acc54883..c429f248cf4e 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 
 struct snd_pcm_substream;
+struct snd_soc_dapm_widget;
 
 /*
  * DAI hardware audio formats.
@@ -238,6 +239,9 @@ struct snd_soc_dai {
         unsigned char pop_wait:1;
         unsigned char probed:1;
 
+        struct snd_soc_dapm_widget *playback_widget;
+        struct snd_soc_dapm_widget *capture_widget;
+
         /* DAI DMA data */
         void *playback_dma_data;
         void *capture_dma_data;
@@ -246,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;