Merge branch 'for-2.6.29' into for-2.6.30

2d663963 · Mark Brown · ef963dcf · 43d50807 · 2d663963
Commit 2d663963 authored Jan 23, 2009 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/sound/soc-dapm.h include/sound/soc-dapm.h +1 -1

No files found.
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -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) \