Merge remote-tracking branch 'asoc/topic/core' into asoc-next

2012-12-15 23:56:43 +09:00
parent 92b2e81d6f 9bffb1fb7c
commit 326b06a8a9
205 changed files with 1586 additions and 1718 deletions
--- 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;
--- 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;