Merge remote-tracking branches 'asoc/topic/dai-drv', 'asoc/topic/davinci', 'asoc...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/soc-core.c
index 724b35671aa6b7ebdfb3faf98af7d1013430c67c,6a13fbcba23f398683d0e1b24cbec69601e20708,c0edac80df34e683291cff5fb86c560ee8e22ffd,345baa4f10c0d1a280d2fd9222b1d51bbc0d35c8,c0edac80df34e683291cff5fb86c560ee8e22ffd,c0edac80df34e683291cff5fb86c560ee8e22ffd..d1f7e639d5b1ca05e1533c1cdddcc546b4723cf6
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
--- 3/sound/soc/soc-core.c
--- 4/sound/soc/soc-core.c
--- 5/sound/soc/soc-core.c
--- 6/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@@ -1392,16 -1392,6 -1392,6 -1392,17 -1392,6 -1392,6 +1392,17 @@@@@@@ static int soc_init_dai_link(struct snd
        return 0;
      }
      
 ++ ++void snd_soc_disconnect_sync(struct device *dev)
 ++ ++{
 ++ ++  struct snd_soc_component *component = snd_soc_lookup_component(dev, NULL);
 ++ ++
 ++ ++  if (!component || !component->card)
 ++ ++          return;
 ++ ++
 ++ ++  snd_card_disconnect_sync(component->card->snd_card);
 ++ ++}
+++ ++EXPORT_SYMBOL_GPL(snd_soc_disconnect_sync);
 ++ ++
      /**
       * snd_soc_add_dai_link - Add a DAI link dynamically
       * @card: The ASoC card to which the DAI link is added