diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-22 03:26:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-22 03:26:33 -0500 |
| commit | a8c136d2eba7b0b0c872e59eb404b1fe36504112 (patch) | |
| tree | d18aaf32b7a8860f164d079a1dcbfec57c2431fd /sound | |
| parent | e51ff2b64baf9d546a7a7641cdd8ec6b17568689 (diff) | |
| parent | a80cc734282805e15b5e023751a4d02f7ffbcc91 (diff) | |
Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 3 |
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[] = { | |||
| 1019 | "EQR", | 1019 | "EQR", |
| 1020 | "LHPF1", | 1020 | "LHPF1", |
| 1021 | "LHPF2", | 1021 | "LHPF2", |
| 1022 | "LHPF3", | ||
| 1023 | "LHPF4", | ||
| 1024 | "DSP1.1", | 1022 | "DSP1.1", |
| 1025 | "DSP1.2", | 1023 | "DSP1.2", |
| 1026 | "DSP1.3", | 1024 | "DSP1.3", |
| @@ -1053,7 +1051,6 @@ static int wm2200_mixer_values[] = { | |||
| 1053 | 0x25, | 1051 | 0x25, |
| 1054 | 0x50, /* EQ */ | 1052 | 0x50, /* EQ */ |
| 1055 | 0x51, | 1053 | 0x51, |
| 1056 | 0x52, | ||
| 1057 | 0x60, /* LHPF1 */ | 1054 | 0x60, /* LHPF1 */ |
| 1058 | 0x61, /* LHPF2 */ | 1055 | 0x61, /* LHPF2 */ |
| 1059 | 0x68, /* DSP1 */ | 1056 | 0x68, /* DSP1 */ |