diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-07-10 07:44:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:19 -0400 |
| commit | 14b42963f64b98ab61fa9723c03d71aa5ef4f862 (patch) | |
| tree | 8d21bb903a6acf2239e9e57e5abc4bceccc4a0ef /sound/aoa | |
| parent | a677c8fb8aa03e6ad9c206cb7284d294761ced2c (diff) | |
[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>
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-tas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c index 2e39ff6ee349..27c1e2eea22b 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 = { \ | |||
| 309 | .private_value = idx, \ | 309 | .private_value = idx, \ |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | MIXER_CONTROL(pcm1, "PCM1", 0); | 312 | MIXER_CONTROL(pcm1, "PCM", 0); |
| 313 | MIXER_CONTROL(monitor, "Monitor", 2); | 313 | MIXER_CONTROL(monitor, "Monitor", 2); |
| 314 | 314 | ||
| 315 | static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol, | 315 | static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol, |