diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
| commit | 7c589750a70831b8cee3c10e01c297fefde104e3 (patch) | |
| tree | 871da898d9953dd50c4830400ba1dd0b614ee311 /sound/soc/codecs/wm8962.c | |
| parent | 07cafff288266c3aa082f4bda3d47989e73ee85d (diff) | |
| parent | e49a3434f1bc64dc49ff3a56e416bb5894868dde (diff) | |
Merge branch 'fix/hda' into topic/hda
Speaker-Out renames are merged.
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 29c4b02c479..0ac228b7dc0 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2564,7 +2564,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w, return 0; } -static const char *st_text[] = { "None", "Right", "Left" }; +static const char *st_text[] = { "None", "Left", "Right" }; static const struct soc_enum str_enum = SOC_ENUM_SINGLE(WM8962_DAC_DSP_MIXING_1, 2, 3, st_text); |