summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-22 16:26:33 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-22 16:26:33 +0800
commita8c136d2eba7b0b0c872e59eb404b1fe36504112 (patch)
treed18aaf32b7a8860f164d079a1dcbfec57c2431fd /sound
parente51ff2b64baf9d546a7a7641cdd8ec6b17568689 (diff)
parenta80cc734282805e15b5e023751a4d02f7ffbcc91 (diff)
downloadlinux-a8c136d2eba7b0b0c872e59eb404b1fe36504112.tar.bz2
Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm2200.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index e6cefe1ac677..d8c65f574658 100644
--- 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 */