projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
soc.h
diff --git
a/include/sound/soc.h
b/include/sound/soc.h
index 85c15226103b09c17c3b48b6366b182cac235ded..5bbdc653a8269e00f143814ecd89a72341289e22 100644
(file)
--- a/
include/sound/soc.h
+++ b/
include/sound/soc.h
@@
-1063,6
+1063,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;