diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-20 11:50:41 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-20 11:50:41 +0000 |
commit | ac6d7c48e3a5e82e876114b9ca0b489e96997743 (patch) | |
tree | d51ab23d4d59248c969c25bb2fc14f45158ff5ae /include/sound/soc.h | |
parent | 31824e6554a4f96a9830fc9d4a15de8a6539857a (diff) | |
parent | 2a99ef0fdb35a0f8d6b56ccc5d9d821e9ff100c1 (diff) | |
download | op-kernel-dev-ac6d7c48e3a5e82e876114b9ca0b489e96997743.zip op-kernel-dev-ac6d7c48e3a5e82e876114b9ca0b489e96997743.tar.gz |
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 03ce45b..9a00147 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1042,6 +1042,7 @@ struct snd_soc_pcm_runtime { /* Dynamic PCM BE runtime data */ struct snd_soc_dpcm_runtime dpcm[2]; + int fe_compr; long pmdown_time; unsigned char pop_wait:1; |