commit 14b42963f64b98ab61fa9723c03d71aa5ef4f862
author Johannes Berg <johannes@sipsolutions.net> Mon Jul 10 04:44:38 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Jul 10 13:24:19 2006 -0700
tree 8d21bb903a6acf2239e9e57e5abc4bceccc4a0ef
parent a677c8fb8aa03e6ad9c206cb7284d294761ced2c

[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 <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

diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 2e39ff6..27c1e2e 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -309,7 +309,7 @@
 	.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,