diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 03:30:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 03:30:01 -0400 |
| commit | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch) | |
| tree | 332809825f5aab97e839ab4534e5b81fb28e0c84 /include/linux | |
| parent | f5b65348fd77839b50e79bc0a5e536832ea52d8d (diff) | |
| parent | cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/dma-contiguous.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index b67bf6ac907d..3c5a4cb3eb95 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | * CMA should not be used by the device drivers directly. It is | 48 | * CMA should not be used by the device drivers directly. It is |
| 49 | * only a helper framework for dma-mapping subsystem. | 49 | * only a helper framework for dma-mapping subsystem. |
| 50 | * | 50 | * |
| 51 | * For more information, see kernel-docs in drivers/base/dma-contiguous.c | 51 | * For more information, see kernel-docs in kernel/dma/contiguous.c |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | #ifdef __KERNEL__ | 54 | #ifdef __KERNEL__ |