diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
| commit | 5b56eec77498f15317f3ff5ac9101372f400c859 (patch) | |
| tree | 1acfb40ca6a19323a292131aa7fca68ef4ef330b /Documentation/sound | |
| parent | c2f43981e5dbc92884149aa2234064cc2c340acd (diff) | |
| parent | 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff) | |
| download | linux-5b56eec77498f15317f3ff5ac9101372f400c859.tar.gz linux-5b56eec77498f15317f3ff5ac9101372f400c859.tar.bz2 linux-5b56eec77498f15317f3ff5ac9101372f400c859.zip | |
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl | 3 |
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> |