summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-04 14:58:07 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-04 14:58:07 +0300
commit153b5c566d30fb984827acb12fd93c3aa6c147d3 (patch)
tree42d224f32069f5e9f6ab07ee6dd2d20c2762ce65 /include/asm-generic
parent7f879e1a94ac99586abf0659c03f35c1e48279c4 (diff)
parent6aa71ef9bcf9d8688c777dfbff340348cb89a5b4 (diff)
downloadlinux-153b5c566d30fb984827acb12fd93c3aa6c147d3.tar.xz
Merge tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze update from Michal Simek: - enable CMA - add support for MB v11 - defconfig updates - minor fixes * tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Add ID for Microblaze v11 microblaze: Prevent the overflow of the start microblaze: Wire CMA allocator asm-generic: Make dma-contiguous.h a mandatory include/asm header microblaze: Sync defconfig with latest Kconfig layout microblaze: defconfig: Disable EXT2 driver and Enable EXT3 & EXT4 drivers microblaze: Align comments with register usage
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index ddfee1bd9dc1..cd17d50697cc 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -4,5 +4,6 @@
# (This file is not included when SRCARCH=um since UML borrows several
# asm headers from the host architecutre.)
+mandatory-y += dma-contiguous.h
mandatory-y += msi.h
mandatory-y += simd.h