diff options
author | Jaroslav Kysela <perex@perex.cz> | 2009-11-03 09:47:25 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-05 03:00:18 -0500 |
commit | d355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (patch) | |
tree | 9edc9951d696d05874f0df53e410c400a1310dbf /sound/isa/es18xx.c | |
parent | 9dcaa7b25f2c8f6a0485854cd3641f585a154072 (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/isa/es18xx.c')
-rw-r--r-- | sound/isa/es18xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 5cf42b4d65fd..e5bf3355d2ca 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
@@ -1313,7 +1313,7 @@ ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0) | |||
1313 | * The chipset specific mixer controls | 1313 | * The chipset specific mixer controls |
1314 | */ | 1314 | */ |
1315 | static struct snd_kcontrol_new snd_es18xx_opt_speaker = | 1315 | static struct snd_kcontrol_new snd_es18xx_opt_speaker = |
1316 | ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0); | 1316 | ES18XX_SINGLE("Beep Playback Volume", 0, 0x3c, 0, 7, 0); |
1317 | 1317 | ||
1318 | static struct snd_kcontrol_new snd_es18xx_opt_1869[] = { | 1318 | static struct snd_kcontrol_new snd_es18xx_opt_1869[] = { |
1319 | ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), | 1319 | ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), |