From 70ff57e6b767c1e12615c3243cc6c27600128ba3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 23 Jan 2010 22:29:54 +0100 Subject: [PATCH] --- yaml --- r: 182733 b: refs/heads/master c: 4e4ac60030293cb3d1e4bacf7c8be9aebdb8df61 h: refs/heads/master i: 182731: 3eacecf49f6ddae0c86225d1274d5e9a1d9e22fa v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_conexant.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc201f99abf8..266078d82f4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f6c3de6a79820de124fa2bb1b77d43a09410e42 +refs/heads/master: 4e4ac60030293cb3d1e4bacf7c8be9aebdb8df61 diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c index 084600e40829..08c5b32dcd63 100644 --- a/trunk/sound/pci/hda/patch_conexant.c +++ b/trunk/sound/pci/hda/patch_conexant.c @@ -1726,8 +1726,8 @@ static struct snd_kcontrol_new cxt5051_hp_mixers[] = { }; static struct snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = { - HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x00, HDA_INPUT), - HDA_CODEC_MUTE("Mic Switch", 0x14, 0x00, HDA_INPUT), + HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x00, HDA_INPUT), + HDA_CODEC_MUTE("Capture Switch", 0x14, 0x00, HDA_INPUT), HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT), { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,