From: Johannes Berg Date: Mon, 10 Jul 2006 11:44:38 +0000 (-0700) Subject: [PATCH] aoa: tas: change PCM1 name to PCM X-Git-Tag: v2.6.18-rc2~195 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b42963f64b98ab61fa9723c03d71aa5ef4f862;p=linux-2.6 [PATCH] aoa: tas: change PCM1 name to PCM This patch changes the PCM1 control name to PCM to make it play nice with the softvol plugin (which will then go away if it sees a proper PCM slider) Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c index 2e39ff6ee3..27c1e2eea2 100644 --- a/sound/aoa/codecs/snd-aoa-codec-tas.c +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c @@ -309,7 +309,7 @@ static struct snd_kcontrol_new n##_control = { \ .private_value = idx, \ } -MIXER_CONTROL(pcm1, "PCM1", 0); +MIXER_CONTROL(pcm1, "PCM", 0); MIXER_CONTROL(monitor, "Monitor", 2); static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,