Merge branch 'fix/asoc' into for-linus
This commit is contained in:
commit
0f0779b155
|
@ -108,7 +108,7 @@
|
||||||
#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
|
#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
|
||||||
wevent, wflags) \
|
wevent, wflags) \
|
||||||
{ .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \
|
{ .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \
|
||||||
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1 \
|
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
|
||||||
.event = wevent, .event_flags = wflags}
|
.event = wevent, .event_flags = wflags}
|
||||||
#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
|
#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
|
||||||
wevent, wflags) \
|
wevent, wflags) \
|
||||||
|
|
Loading…
Reference in New Issue