summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-03 15:47:25 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-05 09:00:18 +0100
commitd355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (patch)
tree9edc9951d696d05874f0df53e410c400a1310dbf /Documentation/sound
parentALSA: sh: add SuperH DAC audio driver for ALSA V4 (diff)
downloadlinux-d355c82a0191d5a3e971bd5af96cc81fe3ed25b9.tar.xz
linux-d355c82a0191d5a3e971bd5af96cc81fe3ed25b9.zip
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 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ControlNames.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
index 5b18298e9495..1bb29814a6fa 100644
--- a/Documentation/sound/alsa/ControlNames.txt
+++ b/Documentation/sound/alsa/ControlNames.txt
@@ -18,8 +18,9 @@ SOURCE:
Master
Master Mono
Hardware Master
+ Internal Speaker
Headphone
- PC Speaker
+ Beep (beep generator)
Phone
Phone Input
Phone Output