aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/pcsp/pcsp_mixer.c
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-03 09:47:25 -0500
committerTakashi Iwai <tiwai@suse.de>2009-11-05 03:00:18 -0500
commitd355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (patch)
tree9edc9951d696d05874f0df53e410c400a1310dbf /sound/drivers/pcsp/pcsp_mixer.c
parent9dcaa7b25f2c8f6a0485854cd3641f585a154072 (diff)
ALSA: rename "PC Speaker" and "PC Beep" controls to "Beep"
To avoid confusion in control names for the standard analog PC Beep generator using a small Internal PC Speaker, rename all related "PC Speaker" and "PC Beep" controls to "Beep" only. This name is more universal and can be also used on more platforms without confusion. Introduce also "Internal Speaker" in ControlNames.txt for systems with full-featured build-in internal speaker. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/pcsp/pcsp_mixer.c')
-rw-r--r--sound/drivers/pcsp/pcsp_mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c
index 02e05552632b..6f633f4f3b96 100644
--- a/sound/drivers/pcsp/pcsp_mixer.c
+++ b/sound/drivers/pcsp/pcsp_mixer.c
@@ -125,7 +125,7 @@ static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_pcm[] = {
125}; 125};
126 126
127static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = { 127static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = {
128 PCSP_MIXER_CONTROL(pcspkr, "PC Speaker Playback Switch"), 128 PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"),
129}; 129};
130 130
131static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip, 131static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,