diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 13:08:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 13:08:16 +0200 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl')
| -rw-r--r-- | Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl index c4d2e3507af..9d644f7e241 100644 --- a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl +++ b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl @@ -42,7 +42,7 @@ <sect1><title>Device Components</title> !Esound/core/device.c </sect1> - <sect1><title>KMOD and Device File Entries</title> + <sect1><title>Module requests and Device File Entries</title> !Esound/core/sound.c </sect1> <sect1><title>Memory Management Helpers</title> |