diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-15 08:39:06 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:58 +0100 |
| commit | fb920b7d8b65f253671073d40d490d0968151680 (patch) | |
| tree | b3053c2161236caee1569b7c0da28dbfb429ba48 /sound/pci | |
| parent | 39516103e683856125b8873fa35f1a7b9172350d (diff) | |
| download | linux-stable-fb920b7d8b65f253671073d40d490d0968151680.tar.gz linux-stable-fb920b7d8b65f253671073d40d490d0968151680.tar.bz2 linux-stable-fb920b7d8b65f253671073d40d490d0968151680.zip | |
[ALSA] oxygen: rename PCM to Master
Rename the 'PCM Playback Volume'/'Switch' mixer controls to 'Master'.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | 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 fcb5813183fb..aa3a5c53d605 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)) |