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.
This commit is contained in:
@@ -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;
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user