summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-23 18:14:25 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-23 18:14:25 +0100
commit0f0779b155f9060dc750e14e0d29e7491263e46b (patch)
tree74f9ef0a347a263f91d6218718a013f2c7f5e155 /include
parent092ebf7a01aa8020501986ab9a2f481a01bb541a (diff)
parent43d50807dbf47a139f83660fec14aebe936b3c80 (diff)
downloadlwn-0f0779b155f9060dc750e14e0d29e7491263e46b.tar.gz
lwn-0f0779b155f9060dc750e14e0d29e7491263e46b.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 93a4edb148b5..dfa804958820 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -108,7 +108,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) \