Commit 29cd581b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 398364a3 f28a1f16

arch/m68k/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE