diff --git a/[refs] b/[refs] index c3c3477521c6..a514e392baf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b290750172b97cb48497a277b3e628083e7246cb +refs/heads/master: bbd993077d788589a86a718ba7a7895ba5e71a17 diff --git a/trunk/include/sound/soc-dai.h b/trunk/include/sound/soc-dai.h index a997c2cac63f..496dc30457b7 100644 --- a/trunk/include/sound/soc-dai.h +++ b/trunk/include/sound/soc-dai.h @@ -205,11 +205,8 @@ struct snd_soc_dai { /* DAI private data */ void *private_data; - /* parent codec/platform */ - union { - struct snd_soc_codec *codec; - struct snd_soc_platform *platform; - }; + /* parent platform */ + struct snd_soc_platform *platform; struct list_head list; };