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
mariux64 · Jul 11, 2019 · 29cd581 · 29cd581
2 parents 398364a + f28a1f1
commit 29cd581
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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