From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 23:23:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/dt' into asoc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=566d4eeff85a8112dddab9d455322e1fcf5defe7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branch 'asoc/topic/dt' into asoc-next
---

566d4eeff85a8112dddab9d455322e1fcf5defe7
diff --cc sound/soc/soc-core.c
index a675eec64756,199eb51d4614..a53698266d57
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1589,14 -1541,10 +1591,15 @@@ static void soc_unregister_ac97_codec(s
  		codec->ac97_registered = 0;
  	}
  }
 +
 +static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
 +{
 +	soc_unregister_ac97_codec(rtd->codec);
 +}
  #endif
  
- static int soc_check_aux_dev(struct snd_soc_card *card, int num)
+ static struct snd_soc_codec *soc_find_matching_codec(struct snd_soc_card *card,
+ 	int num)
  {
  	struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
  	struct snd_soc_codec *codec;