Merge remote-tracking branch 'asoc/fix/wm2200' into tmp

a8c136d2 · Mark Brown · e51ff2b6 · a80cc734 · a8c136d2
Commit a8c136d2 authored Jan 22, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sound/soc/codecs/wm2200.c sound/soc/codecs/wm2200.c +0 -3

No files found.
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1019,8 +1019,6 @@ static const char *wm2200_mixer_texts[] = {
 	"EQR",
 	"LHPF1",
 	"LHPF2",
-	"LHPF3",
-	"LHPF4",
 	"DSP1.1",
 	"DSP1.2",
 	"DSP1.3",
@@ -1053,7 +1051,6 @@ static int wm2200_mixer_values[] = {
 	0x25,
 	0x50,   /* EQ */
 	0x51,
-	0x52,
 	0x60,   /* LHPF1 */
 	0x61,   /* LHPF2 */
 	0x68,   /* DSP1 */