Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fb920b7d8b65f253671073d40d490d0968151680
Commit:     fb920b7d8b65f253671073d40d490d0968151680
Parent:     39516103e683856125b8873fa35f1a7b9172350d
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 15 08:39:06 2008 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:58 2008 +0100

    [ALSA] oxygen: rename PCM to Master
    
    Rename the 'PCM Playback Volume'/'Switch' mixer controls to 'Master'.
    
    Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/oxygen/oxygen_mixer.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fcb5813..aa3a5c5 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -524,7 +524,7 @@ static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
 static const struct snd_kcontrol_new controls[] = {
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "PCM Playback Volume",
+               .name = "Master Playback Volume",
                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                .info = dac_volume_info,
@@ -536,7 +536,7 @@ static const struct snd_kcontrol_new controls[] = {
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "PCM Playback Switch",
+               .name = "Master Playback Switch",
                .info = snd_ctl_boolean_mono_info,
                .get = dac_mute_get,
                .put = dac_mute_put,
@@ -637,7 +637,7 @@ int oxygen_mixer_init(struct oxygen *chip)
                ctl = snd_ctl_new1(&controls[i], chip);
                if (!ctl)
                        return -ENOMEM;
-               if (!strcmp(ctl->id.name, "PCM Playback Volume"))
+               if (!strcmp(ctl->id.name, "Master Playback Volume"))
                        ctl->tlv.p = chip->model->dac_tlv;
                else if (chip->model->cd_in_from_video_in &&
                         !strncmp(ctl->id.name, "CD Capture ", 11))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to