Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 17:14:25 +0000 (18:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 17:14:25 +0000 (18:14 +0100)
include/sound/soc-dapm.h

index 93a4edb148b50815beb254a2a310373b50aff779..dfa804958820d631f52422f55ff2390e477eea9b 100644 (file)
 #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) \