From f83910b5c508ee553bb652fe450b4b855d4bd96d Mon Sep 17 00:00:00 2001 From: Lydia Wang Date: Sat, 10 Oct 2009 19:08:49 +0800 Subject: [PATCH] --- yaml --- r: 170295 b: refs/heads/master c: 71eb7dccb7d2d22236dbe46db07f8000d09fba01 h: refs/heads/master i: 170293: 8f6259065b96d410a2515c6caabcf8fd58948c4c 170291: cce99a1cb3c05f8e9fd3dd2deb7e19f021d186a7 170287: 9fc309253a5684ea0d02841dced25cb996364508 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_via.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f174985be7bc..857e0ff9d919 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab6734e7ea32e9f9cbe0f55eeddf4aa629ed1c3d +refs/heads/master: 71eb7dccb7d2d22236dbe46db07f8000d09fba01 diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c index b3c5e8a78154..257b51c61422 100644 --- a/trunk/sound/pci/hda/patch_via.c +++ b/trunk/sound/pci/hda/patch_via.c @@ -367,7 +367,7 @@ static int bind_pin_switch_put(struct snd_kcontrol *kcontrol, .put = bind_pin_switch_put, \ .private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) } -static struct snd_kcontrol_new vt1708_control_templates[] = { +static struct snd_kcontrol_new via_control_templates[] = { HDA_CODEC_VOLUME(NULL, 0, 0, 0), HDA_CODEC_MUTE(NULL, 0, 0, 0), ANALOG_INPUT_MUTE, @@ -430,7 +430,7 @@ static int via_add_control(struct via_spec *spec, int type, const char *name, knew = snd_array_new(&spec->kctls); if (!knew) return -ENOMEM; - *knew = vt1708_control_templates[type]; + *knew = via_control_templates[type]; knew->name = kstrdup(name, GFP_KERNEL); if (!knew->name) return -ENOMEM;