From 26bdecc2659ad14207c9a1fa7fcc098d04f9d29e Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Tue, 15 Jan 2008 08:39:06 +0100 Subject: [PATCH] --- yaml --- r: 81636 b: refs/heads/master c: fb920b7d8b65f253671073d40d490d0968151680 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/oxygen/oxygen_mixer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94596cdae4de..81a1cdc4d245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39516103e683856125b8873fa35f1a7b9172350d +refs/heads/master: fb920b7d8b65f253671073d40d490d0968151680 diff --git a/trunk/sound/pci/oxygen/oxygen_mixer.c b/trunk/sound/pci/oxygen/oxygen_mixer.c index fcb5813183fb..aa3a5c53d605 100644 --- a/trunk/sound/pci/oxygen/oxygen_mixer.c +++ b/trunk/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))