diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-05 21:47:27 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-05 21:47:27 -0400 |
| commit | 0855250e218eba2eab574959058432beedf0ea5f (patch) | |
| tree | 3c19d4cba8c7c49636260c53e5f2a36ac628d498 /sound | |
| parent | b114701c0e8d580a05643c874d87e2501ab729cb (diff) | |
| parent | 1661c6155589f8faa1338f3cda696ea3f4cb2da1 (diff) | |
Merge branch 'topic/isa-misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/opl3sa2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index ef95279da7a3..0481a55334b9 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
| @@ -481,6 +481,7 @@ OPL3SA2_DOUBLE_TLV("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1, | |||
| 481 | OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1), | 481 | OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1), |
| 482 | OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1, | 482 | OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1, |
| 483 | db_scale_5bit_12db_max), | 483 | db_scale_5bit_12db_max), |
| 484 | OPL3SA2_SINGLE("ZV Port Switch", 0, 0x02, 0, 1, 0), | ||
| 484 | }; | 485 | }; |
| 485 | 486 | ||
| 486 | static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = { | 487 | static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = { |