diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:53 -0500 |
commit | 99896f714a0a940d84476bc6208319f70af30789 (patch) | |
tree | 89002aa02e1308caf0c6a9d99fb5a722aee750e0 /include/sound | |
parent | a9b68d3b90988dd13c668d6b1d45cdca1557f070 (diff) | |
parent | f7d3c17096f6cbca8f0113d5a092ffcc72c7bf41 (diff) |
Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
-rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 243d3b689699..71f27c403194 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -123,6 +123,8 @@ int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); | |||
123 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, | 123 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, |
124 | int direction); | 124 | int direction); |
125 | 125 | ||
126 | int snd_soc_dai_is_dummy(struct snd_soc_dai *dai); | ||
127 | |||
126 | struct snd_soc_dai_ops { | 128 | struct snd_soc_dai_ops { |
127 | /* | 129 | /* |
128 | * DAI clocking configuration, all optional. | 130 | * DAI clocking configuration, all optional. |
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, | |||
412 | int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, | 412 | int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, |
413 | struct snd_soc_dai *dai); | 413 | struct snd_soc_dai *dai); |
414 | int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); | 414 | int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); |
415 | void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); | ||
415 | int snd_soc_dapm_new_pcm(struct snd_soc_card *card, | 416 | int snd_soc_dapm_new_pcm(struct snd_soc_card *card, |
416 | const struct snd_soc_pcm_stream *params, | 417 | const struct snd_soc_pcm_stream *params, |
417 | struct snd_soc_dapm_widget *source, | 418 | struct snd_soc_dapm_widget *source, |