diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 21:22:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 21:22:43 +0200 |
| commit | b42af319f26bcb7d84b42b4bd0ca3b84ba94b160 (patch) | |
| tree | 73b0fcf1e06f5d7e6d8f01476365b65c92d15bc5 /sound/soc/codecs/wm8996.c | |
| parent | ASoC: SAMSUNG: Add Kconfig to support SMDK4212 (diff) | |
| parent | ASoC: MPC5200: replace of_device with platform_device (diff) | |
| download | linux-b42af319f26bcb7d84b42b4bd0ca3b84ba94b160.tar.xz linux-b42af319f26bcb7d84b42b4bd0ca3b84ba94b160.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 73a15888263b..3c9080f78266 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -420,7 +420,7 @@ static const char *sidetone_hpf_text[] = { }; static const struct soc_enum sidetone_hpf = - SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 6, sidetone_hpf_text); + SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 7, sidetone_hpf_text); static const char *hpf_mode_text[] = { "HiFi", "Custom", "Voice" |