diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-11-03 15:47:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-05 09:00:18 +0100 |
| commit | d355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (patch) | |
| tree | 9edc9951d696d05874f0df53e410c400a1310dbf /sound/pci/emu10k1 | |
| parent | 9dcaa7b25f2c8f6a0485854cd3641f585a154072 (diff) | |
| download | linux-d355c82a0191d5a3e971bd5af96cc81fe3ed25b9.tar.gz linux-d355c82a0191d5a3e971bd5af96cc81fe3ed25b9.tar.bz2 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 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emumixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index b0fb6c917c38..05afe06e353a 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -1818,8 +1818,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, "Master Playback Switch", "Master Capture Switch", "Master Playback Volume", "Master Capture Volume", "Wave Master Playback Volume", "Master Playback Volume", - "PC Speaker Playback Switch", "PC Speaker Capture Switch", - "PC Speaker Playback Volume", "PC Speaker Capture Volume", + "Beep Playback Switch", "Beep Capture Switch", + "Beep Playback Volume", "Beep Capture Volume", "Phone Playback Switch", "Phone Capture Switch", "Phone Playback Volume", "Phone Capture Volume", "Mic Playback Switch", "Mic Capture Switch", |