diff options
author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 09:39:16 +0000 |
---|---|---|
committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 09:39:16 +0000 |
commit | 0afa1b62e33250d4777c5803a98ae69fbe872061 (patch) | |
tree | 1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /sound/soc/codecs/wm8962.c | |
parent | 97387e3baaf3c35ad560f8878e943c720a77da1b (diff) | |
parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
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); |