diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-10 10:28:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-10 10:28:49 +0100 |
| commit | 56f1275b856dfafd9593a5010e3d3903e3823d7b (patch) | |
| tree | 6568c575fd2607ee51d9b2a32beba1fea03e900c /include | |
| parent | 97e0002aab037aa0fb746bdfd15e8f8743c9ec13 (diff) | |
| parent | 4616274d3382fa7698536d61b351e63cf0ce27f0 (diff) | |
| download | linux-56f1275b856dfafd9593a5010e3d3903e3823d7b.tar.gz linux-56f1275b856dfafd9593a5010e3d3903e3823d7b.tar.bz2 linux-56f1275b856dfafd9593a5010e3d3903e3823d7b.zip | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d4609029f014..385c6329a967 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -450,7 +450,8 @@ enum snd_soc_dapm_type { snd_soc_dapm_aif_in, /* audio interface input */ snd_soc_dapm_aif_out, /* audio interface output */ snd_soc_dapm_siggen, /* signal generator */ - snd_soc_dapm_dai, /* link to DAI structure */ + snd_soc_dapm_dai_in, /* link to DAI structure */ + snd_soc_dapm_dai_out, snd_soc_dapm_dai_link, /* link between two DAI structures */ }; |