diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:28 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:28 -0500 |
commit | 313769d9edb1bbd59d2e94f5069950eecfe6fa44 (patch) | |
tree | c83c381ed3a6d77ff10129a43023026c7618c427 /sound/pci/ac97 | |
parent | 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (diff) | |
parent | f144b7f6679d9833bd3b94b91e452592b6d0e502 (diff) |
Merge branch 'topic/cs5535audio' into to-push
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_patch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 2c7cd97d2234..81bc93e5f1e3 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[] = { | |||
2054 | .get = snd_ac97_ad1888_lohpsel_get, | 2054 | .get = snd_ac97_ad1888_lohpsel_get, |
2055 | .put = snd_ac97_ad1888_lohpsel_put | 2055 | .put = snd_ac97_ad1888_lohpsel_put |
2056 | }, | 2056 | }, |
2057 | AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1), | 2057 | AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, AC97_AD_VREFD_SHIFT, 1, 1), |
2058 | AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1), | 2058 | AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, |
2059 | AC97_AD_HPFD_SHIFT, 1, 1), | ||
2059 | AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0), | 2060 | AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0), |
2060 | { | 2061 | { |
2061 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 2062 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |