diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
| commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
| tree | 25ccce9c837fbc7beef026b46852197b637be901 /include/sound | |
| parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
| parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) | |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
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 628db7bca4f..3953cea0ecf 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 91244a096c1..769e27c774a 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; |