summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-06 03:47:27 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-06 03:47:27 +0200
commit0855250e218eba2eab574959058432beedf0ea5f (patch)
tree3c19d4cba8c7c49636260c53e5f2a36ac628d498 /sound
parentb114701c0e8d580a05643c874d87e2501ab729cb (diff)
parent1661c6155589f8faa1338f3cda696ea3f4cb2da1 (diff)
downloadlinux-3.10-0855250e218eba2eab574959058432beedf0ea5f.tar.gz
linux-3.10-0855250e218eba2eab574959058432beedf0ea5f.tar.bz2
linux-3.10-0855250e218eba2eab574959058432beedf0ea5f.zip
Merge branch 'topic/isa-misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/opl3sa2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index ef95279da7a..0481a55334b 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,
OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1),
OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1,
db_scale_5bit_12db_max),
+OPL3SA2_SINGLE("ZV Port Switch", 0, 0x02, 0, 1, 0),
};
static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {