diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 17:58:10 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 17:58:10 +0300 |
| commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
| tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /sound/pci/azt3328.c | |
| parent | 7584af10cf46e0f4aa1696f1be79fa0f19a945ba (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
| download | linux-75639e7ee1401b3876c7a00ffe96ea8027668690.tar.xz | |
Merge branch 'topic/beep-rename' into topic/core-change
Diffstat (limited to 'sound/pci/azt3328.c')
| -rw-r--r-- | sound/pci/azt3328.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 8451a0169f32..69867ace7860 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c @@ -830,8 +830,8 @@ static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = { AZF3328_MIXER_SWITCH("Mic Boost (+20dB)", IDX_MIXER_MIC, 6, 0), AZF3328_MIXER_SWITCH("Line Playback Switch", IDX_MIXER_LINEIN, 15, 1), AZF3328_MIXER_VOL_STEREO("Line Playback Volume", IDX_MIXER_LINEIN, 0x1f, 1), - AZF3328_MIXER_SWITCH("PC Speaker Playback Switch", IDX_MIXER_PCBEEP, 15, 1), - AZF3328_MIXER_VOL_SPECIAL("PC Speaker Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1), + AZF3328_MIXER_SWITCH("Beep Playback Switch", IDX_MIXER_PCBEEP, 15, 1), + AZF3328_MIXER_VOL_SPECIAL("Beep Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1), AZF3328_MIXER_SWITCH("Video Playback Switch", IDX_MIXER_VIDEO, 15, 1), AZF3328_MIXER_VOL_STEREO("Video Playback Volume", IDX_MIXER_VIDEO, 0x1f, 1), AZF3328_MIXER_SWITCH("Aux Playback Switch", IDX_MIXER_AUX, 15, 1), |