summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-06-01 13:01:13 +0100
committerMark Brown <broonie@kernel.org>2020-06-01 13:01:13 +0100
commita72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (patch)
tree5d9292f82ef7a236930febee51373565e1842398 /include/sound
parent9cb1fd0efd195590b828b9b865421ad345a4a145 (diff)
parentf4aa5e214eeaf7f1c7f157526a5aa29784cb6a1f (diff)
Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 946f88a6c63d..53e2062b9cef 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -790,9 +790,6 @@ struct snd_soc_dai_link {
const struct snd_soc_pcm_stream *params;
unsigned int num_params;
- struct snd_soc_dapm_widget *playback_widget;
- struct snd_soc_dapm_widget *capture_widget;
-
unsigned int dai_fmt; /* format to set on init */
enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
@@ -1156,6 +1153,9 @@ struct snd_soc_pcm_runtime {
struct snd_soc_dai **cpu_dais;
unsigned int num_cpus;
+ struct snd_soc_dapm_widget *playback_widget;
+ struct snd_soc_dapm_widget *capture_widget;
+
struct delayed_work delayed_work;
void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd);
#ifdef CONFIG_DEBUG_FS