diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 09:30:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 09:30:01 +0200 |
commit | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch) | |
tree | 332809825f5aab97e839ab4534e5b81fb28e0c84 /Documentation/driver-api | |
parent | proc: fix missing final NUL in get_mm_cmdline() rewrite (diff) | |
parent | dma-mapping: move all DMA mapping code to kernel/dma (diff) | |
download | linux-6d90eb7ba341b3eb035121eff0b69d370cbc251e.tar.xz linux-6d90eb7ba341b3eb035121eff0b69d370cbc251e.zip |
Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping rename from Christoph Hellwig:
"Move all the dma-mapping code to kernel/dma and lose their dma-*
prefixes"
* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: move all DMA mapping code to kernel/dma
dma-mapping: use obj-y instead of lib-y for generic dma ops
Diffstat (limited to 'Documentation/driver-api')
-rw-r--r-- | Documentation/driver-api/infrastructure.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/driver-api/infrastructure.rst index bee1b9a1702f..6172f3cc3d0b 100644 --- a/Documentation/driver-api/infrastructure.rst +++ b/Documentation/driver-api/infrastructure.rst @@ -49,10 +49,10 @@ Device Drivers Base Device Drivers DMA Management ----------------------------- -.. kernel-doc:: drivers/base/dma-coherent.c +.. kernel-doc:: kernel/dma/coherent.c :export: -.. kernel-doc:: drivers/base/dma-mapping.c +.. kernel-doc:: kernel/dma/mapping.c :export: Device drivers PnP support |