summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-07-08 10:51:01 -0700
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-07-09 09:13:24 +0200
commitf28a1f16135c9c6366f3d3f20f2e58aefc99afa0 (patch)
tree79a6a640ae1c964b3987e25585db495ab66d49c2 /arch
parent69878ef47562f32e02d0b7975c990e1c0339320d (diff)
downloadlinux-f28a1f16135c9c6366f3d3f20f2e58aefc99afa0.tar.bz2
m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire
M68k only provides the arch_dma_prep_coherent symbol when an mmu is enabled and not on the coldfire platform. Fix the Kconfig symbol selection up to match this. Fixes: 69878ef47562 ("m68k: Implement arch_dma_prep_coherent()") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 00f5c98a5e05..678d3d2ff319 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,7 +4,7 @@ config M68K
default y
select ARCH_32BIT_OFF_T
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