diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
| commit | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch) | |
| tree | 332809825f5aab97e839ab4534e5b81fb28e0c84 /kernel/Makefile | |
| 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-dev-6d90eb7ba341b3eb035121eff0b69d370cbc251e.tar.xz linux-dev-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 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index d2001624fe7a..04bc07c2b42a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -41,6 +41,7 @@ obj-y += printk/ obj-y += irq/ obj-y += rcu/ obj-y += livepatch/ +obj-y += dma/ obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o |