summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-20 10:30:01 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-20 10:30:01 +0300
commit6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch)
tree332809825f5aab97e839ab4534e5b81fb28e0c84 /Documentation
parentf5b65348fd77839b50e79bc0a5e536832ea52d8d (diff)
parentcf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 (diff)
downloadlinux-6d90eb7ba341b3eb035121eff0b69d370cbc251e.tar.xz
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')
-rw-r--r--Documentation/driver-api/infrastructure.rst4
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