aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 15:02:08 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 15:02:08 +0000
commit2d663963dd915c1a342a03c820b648bd5f06b6a7 (patch)
tree3805c6ed9f376e66802ece5dc496e7e770fdbfcb /include/sound
parentef963dcf6879e500e6559b4327f6cbdc4439198e (diff)
parent43d50807dbf47a139f83660fec14aebe936b3c80 (diff)
downloadkernel_samsung_tuna-2d663963dd915c1a342a03c820b648bd5f06b6a7.zip
kernel_samsung_tuna-2d663963dd915c1a342a03c820b648bd5f06b6a7.tar.gz
kernel_samsung_tuna-2d663963dd915c1a342a03c820b648bd5f06b6a7.tar.bz2
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'include/sound')
-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 0accdba..bb3a863 100644
--- 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) \