diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-04-24 09:24:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-24 09:24:44 +0300 |
| commit | 10635d2d2a4c95044217fe8ea6e5f5451fd07ae8 (patch) | |
| tree | c4382d0e6897de33df2f56502e30eb2aae99c84a /include | |
| parent | 36dbae9945322e660795e73ffc8ed8ae4f25d13d (diff) | |
| parent | 977dfef40c8996b69afe23a9094d184049efb7bb (diff) | |
| download | linux-10635d2d2a4c95044217fe8ea6e5f5451fd07ae8.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge 5.7-rc devel branch for further changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
| -rw-r--r-- | include/sound/soc.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index d4825b82c7a3..b33abe93b905 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -351,7 +351,6 @@ struct snd_soc_dai { /* bit field */ unsigned int probed:1; - unsigned int started[SNDRV_PCM_STREAM_LAST + 1]; }; static inline struct snd_soc_pcm_stream * diff --git a/include/sound/soc.h b/include/sound/soc.h index 13458e4fbb13..946f88a6c63d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -790,6 +790,9 @@ 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 */ |