diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 14:56:43 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 14:56:43 (GMT) |
commit | 326b06a8a9b09d6d9a276fd550b6b6bb138e9a47 (patch) | |
tree | b9bdcb0bd635b91258cec09c981af2c5dcc0f683 /include/sound | |
parent | 92b2e81d6f95bcee386abac4c4389f5b950f7bb9 (diff) | |
parent | 9bffb1fb7c22c96d51d4ba06e2e023dd568a5872 (diff) | |
download | linux-326b06a8a9b09d6d9a276fd550b6b6bb138e9a47.tar.xz |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
-rw-r--r-- | include/sound/soc.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 628db7b..3953cea 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -242,7 +242,6 @@ struct snd_soc_dai { unsigned int symmetric_rates:1; struct snd_pcm_runtime *runtime; unsigned int active; - unsigned char pop_wait:1; unsigned char probed:1; struct snd_soc_dapm_widget *playback_widget; diff --git a/include/sound/soc.h b/include/sound/soc.h index 91244a0..769e27c 100644 --- 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; |