diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
| commit | fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 (patch) | |
| tree | 779a8b572d1701ef2c46755df751d9275650cdf4 /sound/pci/ac97/ac97_codec.c | |
| parent | 85cd7251b9112e3dabeac9fd3b175601ca607241 (diff) | |
| parent | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (diff) | |
| download | talos-obmc-linux-fc851fad00d7fa1bf4ac7034d9ba8041bf482d50.tar.gz talos-obmc-linux-fc851fad00d7fa1bf4ac7034d9ba8041bf482d50.zip | |
Merge branch 'upstream' into pata-drivers
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 0abf2808d59f..51e83d7a839a 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -573,7 +573,7 @@ AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) }; static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = - AC97_SINGLE("Mic Boost (+20dB) Switch", AC97_MIC, 6, 1, 0); + AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0); static const char* std_rec_sel[] = {"Mic", "CD", "Video", "Aux", "Line", "Mix", "Mix Mono", "Phone"}; @@ -615,7 +615,7 @@ AC97_SINGLE("Simulated Stereo Enhancement", AC97_GENERAL_PURPOSE, 14, 1, 0), AC97_SINGLE("3D Control - Switch", AC97_GENERAL_PURPOSE, 13, 1, 0), AC97_SINGLE("Loudness (bass boost)", AC97_GENERAL_PURPOSE, 12, 1, 0), AC97_ENUM("Mono Output Select", std_enum[2]), -AC97_ENUM("Mic Select Capture Switch", std_enum[3]), +AC97_ENUM("Mic Select", std_enum[3]), AC97_SINGLE("ADC/DAC Loopback", AC97_GENERAL_PURPOSE, 7, 1, 0) }; |
