summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-16 13:42:53 +0100
committerMark Brown <broonie@linaro.org>2014-01-16 13:42:53 +0100
commit99896f714a0a940d84476bc6208319f70af30789 (patch)
tree89002aa02e1308caf0c6a9d99fb5a722aee750e0 /include/sound/soc-dapm.h
parentMerge remote-tracking branch 'asoc/topic/core' into for-tiwai (diff)
parentASoC: dapm: Change prototype of soc_widget_read (diff)
downloadlinux-99896f714a0a940d84476bc6208319f70af30789.tar.xz
linux-99896f714a0a940d84476bc6208319f70af30789.zip
Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 56ebdfca6273..68d92e36facd 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -412,6 +412,7 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
struct snd_soc_dai *dai);
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
+void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
const struct snd_soc_pcm_stream *params,
struct snd_soc_dapm_widget *source,