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;