diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-23 12:14:25 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-23 12:14:25 -0500 |
| commit | 0f0779b155f9060dc750e14e0d29e7491263e46b (patch) | |
| tree | 74f9ef0a347a263f91d6218718a013f2c7f5e155 /include | |
| parent | 092ebf7a01aa8020501986ab9a2f481a01bb541a (diff) | |
| parent | 43d50807dbf47a139f83660fec14aebe936b3c80 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include')
| -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 93a4edb148b5..dfa804958820 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ | 108 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ |
| 109 | wevent, wflags) \ | 109 | wevent, wflags) \ |
| 110 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ | 110 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ |
| 111 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1 \ | 111 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \ |
| 112 | .event = wevent, .event_flags = wflags} | 112 | .event = wevent, .event_flags = wflags} |
| 113 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ | 113 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ |
| 114 | wevent, wflags) \ | 114 | wevent, wflags) \ |