diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 10:02:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 10:02:08 -0500 |
| commit | 2d663963dd915c1a342a03c820b648bd5f06b6a7 (patch) | |
| tree | 3805c6ed9f376e66802ece5dc496e7e770fdbfcb /include/sound/soc-dapm.h | |
| parent | ef963dcf6879e500e6559b4327f6cbdc4439198e (diff) | |
| parent | 43d50807dbf47a139f83660fec14aebe936b3c80 (diff) | |
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 0accdba211f9..bb3a863ad14e 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -118,7 +118,7 @@ | |||
| 118 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ | 118 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ |
| 119 | wevent, wflags) \ | 119 | wevent, wflags) \ |
| 120 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ | 120 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ |
| 121 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1 \ | 121 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \ |
| 122 | .event = wevent, .event_flags = wflags} | 122 | .event = wevent, .event_flags = wflags} |
| 123 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ | 123 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ |
| 124 | wevent, wflags) \ | 124 | wevent, wflags) \ |