diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:29 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:29 (GMT) |
| commit | 6a47366973be7d234952332e09646981951d3879 (patch) | |
| tree | 1ef55f028c7a017d75d75434223c2b7f907dd935 /include | |
| parent | 81fd7e48f44637b7e677b3dc0d298126d81a2320 (diff) | |
| parent | da18396f949ecaa45007d3aeb1b81bd6da092811 (diff) | |
| download | linux-6a47366973be7d234952332e09646981951d3879.tar.xz | |
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 3953cea..a680f23 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -126,7 +126,8 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai, int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); /* Digital Audio Interface mute */ -int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute); +int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, + int direction); struct snd_soc_dai_ops { /* @@ -157,6 +158,7 @@ struct snd_soc_dai_ops { * Called by soc-core to minimise any pops. */ int (*digital_mute)(struct snd_soc_dai *dai, int mute); + int (*mute_stream)(struct snd_soc_dai *dai, int mute, int stream); /* * ALSA PCM audio operations - all optional. |