History

Merge branch 'for-linus' into for-next

Merge for 5.18-rc1

Takashi Iwai committed 4 years ago

Commit 1212fa12 parents 03a8b0d 7b0efea57 files · +492 −263Browse files

Showing the changes to include (1 of 57 files). Show all

Unified · Split

include/sound/soc-component.h+4−0
@@ -179,6 +179,10 @@ struct snd_soc_component_driver { · 178 unmodified lines
179 struct snd_pcm_hw_params *params);179 struct snd_pcm_hw_params *params);
180 bool use_dai_pcm_id; /* use DAI link PCM ID as PCM device number */180 bool use_dai_pcm_id; /* use DAI link PCM ID as PCM device number */
181 int be_pcm_base; /* base device ID for all BE PCMs */181 int be_pcm_base; /* base device ID for all BE PCMs */
182
183#ifdef CONFIG_DEBUG_FS
184 const char *debugfs_prefix;
185#endif
182};186};
183 187
184struct snd_soc_component {188struct snd_soc_component {