summaryrefslogtreecommitdiffstats
path: root/sound/pci/ac97
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:28 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:28 +0100
commit313769d9edb1bbd59d2e94f5069950eecfe6fa44 (patch)
treec83c381ed3a6d77ff10129a43023026c7618c427 /sound/pci/ac97
parent8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (diff)
parentf144b7f6679d9833bd3b94b91e452592b6d0e502 (diff)
downloadkernel-crypto-313769d9edb1bbd59d2e94f5069950eecfe6fa44.tar.gz
kernel-crypto-313769d9edb1bbd59d2e94f5069950eecfe6fa44.tar.xz
kernel-crypto-313769d9edb1bbd59d2e94f5069950eecfe6fa44.zip
Merge branch 'topic/cs5535audio' into to-push
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r--sound/pci/ac97/ac97_patch.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 2c7cd97d223..81bc93e5f1e 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -2054,8 +2054,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = {
.get = snd_ac97_ad1888_lohpsel_get,
.put = snd_ac97_ad1888_lohpsel_put
},
- AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1),
- AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1),
+ AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, AC97_AD_VREFD_SHIFT, 1, 1),
+ AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2,
+ AC97_AD_HPFD_SHIFT, 1, 1),
AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0),
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,