diff options
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 6 | ||||
-rw-r--r-- | sound/pci/ac97/ac97_patch.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 78288dbfc17a..20cb60afb200 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -603,8 +603,8 @@ AC97_SINGLE("Tone Control - Treble", AC97_MASTER_TONE, 0, 15, 1) | |||
603 | }; | 603 | }; |
604 | 604 | ||
605 | static const struct snd_kcontrol_new snd_ac97_controls_pc_beep[2] = { | 605 | static const struct snd_kcontrol_new snd_ac97_controls_pc_beep[2] = { |
606 | AC97_SINGLE("PC Speaker Playback Switch", AC97_PC_BEEP, 15, 1, 1), | 606 | AC97_SINGLE("Beep Playback Switch", AC97_PC_BEEP, 15, 1, 1), |
607 | AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) | 607 | AC97_SINGLE("Beep Playback Volume", AC97_PC_BEEP, 1, 15, 1) |
608 | }; | 608 | }; |
609 | 609 | ||
610 | static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = | 610 | static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = |
@@ -1393,7 +1393,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) | |||
1393 | } | 1393 | } |
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | /* build PC Speaker controls */ | 1396 | /* build Beep controls */ |
1397 | if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && | 1397 | if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && |
1398 | ((ac97->flags & AC97_HAS_PC_BEEP) || | 1398 | ((ac97->flags & AC97_HAS_PC_BEEP) || |
1399 | snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) { | 1399 | snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) { |
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 7337abdbe4e3..139cf3b2b9d7 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c | |||
@@ -800,12 +800,12 @@ AC97_SINGLE("Mono Switch", AC97_MASTER_TONE, 7, 1, 1), | |||
800 | AC97_SINGLE("Mono ZC Switch", AC97_MASTER_TONE, 6, 1, 0), | 800 | AC97_SINGLE("Mono ZC Switch", AC97_MASTER_TONE, 6, 1, 0), |
801 | AC97_SINGLE("Mono Volume", AC97_MASTER_TONE, 0, 31, 1), | 801 | AC97_SINGLE("Mono Volume", AC97_MASTER_TONE, 0, 31, 1), |
802 | 802 | ||
803 | AC97_SINGLE("PC Beep to Headphone Switch", AC97_AUX, 15, 1, 1), | 803 | AC97_SINGLE("Beep to Headphone Switch", AC97_AUX, 15, 1, 1), |
804 | AC97_SINGLE("PC Beep to Headphone Volume", AC97_AUX, 12, 7, 1), | 804 | AC97_SINGLE("Beep to Headphone Volume", AC97_AUX, 12, 7, 1), |
805 | AC97_SINGLE("PC Beep to Master Switch", AC97_AUX, 11, 1, 1), | 805 | AC97_SINGLE("Beep to Master Switch", AC97_AUX, 11, 1, 1), |
806 | AC97_SINGLE("PC Beep to Master Volume", AC97_AUX, 8, 7, 1), | 806 | AC97_SINGLE("Beep to Master Volume", AC97_AUX, 8, 7, 1), |
807 | AC97_SINGLE("PC Beep to Mono Switch", AC97_AUX, 7, 1, 1), | 807 | AC97_SINGLE("Beep to Mono Switch", AC97_AUX, 7, 1, 1), |
808 | AC97_SINGLE("PC Beep to Mono Volume", AC97_AUX, 4, 7, 1), | 808 | AC97_SINGLE("Beep to Mono Volume", AC97_AUX, 4, 7, 1), |
809 | 809 | ||
810 | AC97_SINGLE("Voice to Headphone Switch", AC97_PCM, 15, 1, 1), | 810 | AC97_SINGLE("Voice to Headphone Switch", AC97_PCM, 15, 1, 1), |
811 | AC97_SINGLE("Voice to Headphone Volume", AC97_PCM, 12, 7, 1), | 811 | AC97_SINGLE("Voice to Headphone Volume", AC97_PCM, 12, 7, 1), |