diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-11-04 08:30:36 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-05 03:00:21 -0500 |
| commit | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (patch) | |
| tree | c629385ab97f3421736aa66173884d1ac69c0ddb /sound/ppc/burgundy.c | |
| parent | d355c82a0191d5a3e971bd5af96cc81fe3ed25b9 (diff) | |
ALSA: rename "PC Speaker" controls to "Speaker"
To unify control names, rename "PC Speaker" to "Speaker" for PPC ALSA drivers.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc/burgundy.c')
| -rw-r--r-- | sound/ppc/burgundy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 16ed240e423c..0accfe49735b 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
| @@ -505,7 +505,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = { | |||
| 505 | MASK_ADDR_BURGUNDY_GAINLINE, 1, 0), | 505 | MASK_ADDR_BURGUNDY_GAINLINE, 1, 0), |
| 506 | BURGUNDY_VOLUME_B("Mic Gain Capture Volume", 0, | 506 | BURGUNDY_VOLUME_B("Mic Gain Capture Volume", 0, |
| 507 | MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), | 507 | MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), |
| 508 | BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0, | 508 | BURGUNDY_VOLUME_B("Speaker Playback Volume", 0, |
| 509 | MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), | 509 | MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), |
| 510 | BURGUNDY_VOLUME_B("Line out Playback Volume", 0, | 510 | BURGUNDY_VOLUME_B("Line out Playback Volume", 0, |
| 511 | MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1, 1), | 511 | MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1, 1), |
| @@ -527,7 +527,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = { | |||
| 527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), | 527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), |
| 528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, | 528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, |
| 529 | MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), | 529 | MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), |
| 530 | BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0, | 530 | BURGUNDY_VOLUME_B("Speaker Playback Volume", 0, |
| 531 | MASK_ADDR_BURGUNDY_ATTENMONO, 0, 1), | 531 | MASK_ADDR_BURGUNDY_ATTENMONO, 0, 1), |
| 532 | BURGUNDY_VOLUME_B("Line out Playback Volume", 0, | 532 | BURGUNDY_VOLUME_B("Line out Playback Volume", 0, |
| 533 | MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), | 533 | MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), |
| @@ -549,11 +549,11 @@ BURGUNDY_SWITCH_B("Master Playback Switch", 0, | |||
| 549 | BURGUNDY_OUTPUT_INTERN | 549 | BURGUNDY_OUTPUT_INTERN |
| 550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
| 551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata = | 551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata = |
| 552 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 552 | BURGUNDY_SWITCH_B("Speaker Playback Switch", 0, |
| 553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
| 554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
| 555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata = | 555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata = |
| 556 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 556 | BURGUNDY_SWITCH_B("Speaker Playback Switch", 0, |
| 557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
| 558 | BURGUNDY_OUTPUT_INTERN, 0, 0); | 558 | BURGUNDY_OUTPUT_INTERN, 0, 0); |
| 559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata = | 559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata = |