Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f2f48e1859167c936af957a828da1e9ec76848cd
Commit:     f2f48e1859167c936af957a828da1e9ec76848cd
Parent:     4bb261302b34998e8c3c8d8f0493ee9e58d57cb2
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 28 18:14:43 2008 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:30:20 2008 +0100

    [ALSA] hda-codec - Fix ALC262 HP-RP5700 model
    
    Removed the PCM mixer elements conflicting with others.
    Also renamed Master control to Headphone, which isn't a real master.
    (The Master control is still created as a virtual master even after
     this rename.)
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_realtek.c |   24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index e484f60..dca8ba0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8099,29 +8099,9 @@ static struct hda_verb alc262_hp_t5735_verbs[] = {
        { }
 };
 
-static struct hda_bind_ctls alc262_hp_rp5700_bind_front_vol = {
-       .ops = &snd_hda_bind_vol,
-       .values = {
-               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
-               HDA_COMPOSE_AMP_VAL(0x0e, 3, 0, HDA_OUTPUT),
-               0
-       },
-};
-
-static struct hda_bind_ctls alc262_hp_rp5700_bind_front_sw = {
-       .ops = &snd_hda_bind_sw,
-       .values = {
-               HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
-               HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_OUTPUT),
-               0
-       },
-};
-
 static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
-       HDA_BIND_VOL("PCM Playback Volume", &alc262_hp_rp5700_bind_front_vol),
-       HDA_BIND_SW("PCM Playback Switch", &alc262_hp_rp5700_bind_front_sw),
-       HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-       HDA_CODEC_MUTE("Master Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+       HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+       HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
        HDA_CODEC_MUTE("Speaker Playback Switch", 0x16, 0x0, HDA_OUTPUT),
        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to