summaryrefslogtreecommitdiffstats
path: root/sound/core/oss
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-04 14:30:36 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-05 09:00:21 +0100
commitad1cd745060ae2f24026b3b3d09da3426df6ab36 (patch)
treec629385ab97f3421736aa66173884d1ac69c0ddb /sound/core/oss
parentd355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (diff)
downloadop-kernel-dev-ad1cd745060ae2f24026b3b3d09da3426df6ab36.zip
op-kernel-dev-ad1cd745060ae2f24026b3b3d09da3426df6ab36.tar.gz
ALSA: rename "PC Speaker" controls to "Speaker"
To unify control names, rename "PC Speaker" to "Speaker" for PPC ALSA drivers. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/oss')
-rw-r--r--sound/core/oss/mixer_oss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index b935ac9..54e2eb5 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1253,6 +1253,7 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)
{ SOUND_MIXER_PCM, "PCM", 0 },
{ SOUND_MIXER_SPEAKER, "Beep", 0 },
{ SOUND_MIXER_SPEAKER, "PC Speaker", 0 }, /* fallback */
+ { SOUND_MIXER_SPEAKER, "Speaker", 0 }, /* fallback */
{ SOUND_MIXER_LINE, "Line", 0 },
{ SOUND_MIXER_MIC, "Mic", 0 },
{ SOUND_MIXER_CD, "CD", 0 },
OpenPOWER on IntegriCloud