Commit 2d663963 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.29' into for-2.6.30

parents ef963dcf 43d50807

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.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}

#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \