]> err.no Git - linux-2.6/commitdiff
[PATCH] aoa: tas: change PCM1 name to PCM
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 10 Jul 2006 11:44:38 +0000 (04:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 20:24:19 +0000 (13:24 -0700)
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 <johannes@sipsolutions.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
sound/aoa/codecs/snd-aoa-codec-tas.c

index 2e39ff6ee349b0888196d1e1a7521e2b7c6acfaa..27c1e2eea22bc9c8783fd9473d803b13d5befb58 100644 (file)
@@ -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,