summaryrefslogtreecommitdiff
path: root/Documentation/sound/alsa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-23 23:35:43 (GMT)
committerTakashi Iwai <tiwai@suse.de>2009-03-23 23:35:43 (GMT)
commit5b56eec77498f15317f3ff5ac9101372f400c859 (patch)
tree1acfb40ca6a19323a292131aa7fca68ef4ef330b /Documentation/sound/alsa
parentc2f43981e5dbc92884149aa2234064cc2c340acd (diff)
parent662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff)
downloadlinux-fsl-qoriq-5b56eec77498f15317f3ff5ac9101372f400c859.tar.xz
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'Documentation/sound/alsa')
-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 9d644f7..37b006c 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>