Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Jan 2013 08:26:33 +0000 (16:26 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Jan 2013 08:26:33 +0000 (16:26 +0800)
sound/soc/codecs/wm2200.c

index e6cefe1..d8c65f5 100644 (file)
@@ -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 */