Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...

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

diff --cc arch/m68k/Kconfig
index 8f765cfefca6f9e55ce6351439447e9d5ce63f33,678d3d2ff319edeff6e93390bee135cd346a430c..c518d695c3760745a3d468f570208448eff16652
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,9 -3,8 +3,9 @@@ config M68
        bool
        default y
        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