Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d930f008 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

parents 1c4b578a faf6615b

include/sound/soc-dapm.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ struct device; 
	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \

{	.id = snd_soc_dapm_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, \