summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:51 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:51 +0100
commit33dbe6114047496a5b6fee0941c52dad41250043 (patch)
tree74f84bc9658f4e72a22e89429aedbe49fdc13db4 /Documentation/sound
parentALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff)
parentALSA: Add sound/core/jack.c to driver-API docbook entry (diff)
downloadlinux-33dbe6114047496a5b6fee0941c52dad41250043.tar.xz
linux-33dbe6114047496a5b6fee0941c52dad41250043.zip
Merge branch 'topic/jack' into topic/docbook-fix
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
index 9d644f7e241e..37b006cdf2f9 100644
--- a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
+++ b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
@@ -89,6 +89,9 @@
<sect1><title>Hardware-Dependent Devices API</title>
!Esound/core/hwdep.c
</sect1>
+ <sect1><title>Jack Abstraction Layer API</title>
+!Esound/core/jack.c
+ </sect1>
<sect1><title>ISA DMA Helpers</title>
!Esound/core/isadma.c
</sect1>