diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:47 +0100 |
| commit | ec6659c3898798a9cf3010d6c61a8ea6fa123073 (patch) | |
| tree | eb1fb4165fe7b897f14bbe9a56a775063e005b90 /Documentation/sound | |
| parent | c944a93df0d566a66409628c4524f4fc4f62eaf5 (diff) | |
| parent | 79c7cdd5441f5d3900c1632adcc8cd2bee35c8da (diff) | |
| download | op-kernel-dev-ec6659c3898798a9cf3010d6c61a8ea6fa123073.zip op-kernel-dev-ec6659c3898798a9cf3010d6c61a8ea6fa123073.tar.gz | |
Merge branch 'topic/vmaster-update' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl index 37b006c..90f163c 100644 --- a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl +++ b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl @@ -71,6 +71,10 @@ !Esound/pci/ac97/ac97_codec.c !Esound/pci/ac97/ac97_pcm.c </sect1> + <sect1><title>Virtual Master Control API</title> +!Esound/core/vmaster.c +!Iinclude/sound/control.h + </sect1> </chapter> <chapter><title>MIDI API</title> <sect1><title>Raw MIDI API</title> |
