Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...

[karo-tx-linux.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 91244a096c190223c17272aa23d219f47b40ab71..769e27c774a3de382ec93650766621056dc78820 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1039,6 +1039,7 @@ struct snd_soc_pcm_runtime {
        struct snd_soc_dpcm_runtime dpcm[2];
 
        long pmdown_time;
+       unsigned char pop_wait:1;
 
        /* runtime devices */
        struct snd_pcm *pcm;