diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 11:58:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 11:58:07 +0000 |
| commit | 153b5c566d30fb984827acb12fd93c3aa6c147d3 (patch) | |
| tree | 42d224f32069f5e9f6ab07ee6dd2d20c2762ce65 /arch/arm64 | |
| parent | 7f879e1a94ac99586abf0659c03f35c1e48279c4 (diff) | |
| parent | 6aa71ef9bcf9d8688c777dfbff340348cb89a5b4 (diff) | |
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 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index bd23f87d6c55..d3077c991962 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@ -3,7 +3,6 @@ generic-y += bugs.h generic-y += delay.h generic-y += div64.h generic-y += dma.h -generic-y += dma-contiguous.h generic-y += dma-mapping.h generic-y += early_ioremap.h generic-y += emergency-restart.h |