diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-10 21:44:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-10 21:44:07 -0700 |
| commit | 29cd581b59496c26334c910a8b848baa81a6becd (patch) | |
| tree | fa20e332ebb21af2bc8f8cb89051a3a10ac6a4a2 /arch | |
| parent | 398364a35daed7361e76c3666fb9a97792edce09 (diff) | |
| parent | f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 (diff) | |
| download | linux-29cd581b59496c26334c910a8b848baa81a6becd.tar.bz2 | |
Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven:
"Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire.
This is a fix for an issue detected in next, to avoid introducing
build failures when merging Christoph's dma-mapping tree later"
* tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 8f765cfefca6..c518d695c376 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -5,7 +5,7 @@ config M68K select ARCH_32BIT_OFF_T select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE - select ARCH_HAS_DMA_PREP_COHERENT + select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_NO_COHERENT_DMA_MMAP if !MMU |