summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm2200.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-02-08 03:10:18 +0100
committerDave Airlie <airlied@redhat.com>2013-02-08 03:10:18 +0100
commit6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (patch)
tree38a6c5d4896de01449e9d224088ae223161fcd3c /sound/soc/codecs/wm2200.c
parentMerge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet... (diff)
parentRevert "Revert "console: implement lockdep support for console_lock"" (diff)
downloadlinux-6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7.tar.xz
linux-6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7.zip
Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next
This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep reported issues and re-enables fbcon lockdep. (not the fbcon maintainer) * 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits) Revert "Revert "console: implement lockdep support for console_lock"" fbcon: fix locking harder fb: Yet another band-aid for fixing lockdep mess fb: rework locking to fix lock ordering on takeover
Diffstat (limited to 'sound/soc/codecs/wm2200.c')
-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 */