diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-01 11:15:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-01 11:15:34 +1000 |
| commit | 5df15c4566a7be02a0bd9133cd5af08f841d868f (patch) | |
| tree | d99f1f1bd667dd555a1034a322bbae57661bce3b /Documentation | |
| parent | 26d5550d369595c858767a2bf7c26718616cdba5 (diff) | |
| parent | 0997e378be1d888a5d093eeee55f842cdfe55ebe (diff) | |
Merge remote-tracking branch 'sound/for-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/hd-audio/notes.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/sound/hd-audio/notes.rst b/Documentation/sound/hd-audio/notes.rst index 9eeb9b468706..f59c3cdbfaf4 100644 --- a/Documentation/sound/hd-audio/notes.rst +++ b/Documentation/sound/hd-audio/notes.rst @@ -494,6 +494,8 @@ add_hp_mic (bool) hp_mic_detect (bool) enable/disable the hp/mic shared input for a single built-in mic case; default true +vmaster (bool) + enable/disable the virtual Master control; default true mixer_nid (int) specifies the widget NID of the analog-loopback mixer |