diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-08-16 15:47:53 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-09-20 09:01:14 +0200 |
| commit | 5748e1b35ba28368515d850e8087929a3a65e055 (patch) | |
| tree | ef6a0559e014c9ab5653a10c2a902b7c2cf28e3f /arch/mips/kernel/setup.c | |
| parent | dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration (diff) | |
| download | linux-5748e1b35ba28368515d850e8087929a3a65e055.tar.xz linux-5748e1b35ba28368515d850e8087929a3a65e055.zip | |
MIPS: don't select DMA_MAYBE_COHERENT from DMA_PERDEV_COHERENT
While both option select a form of conditional dma coherence they don't
actually share any code in the implementation, so untangle them.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com>
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index c71d1eb7da59..6d840a44fa36 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1067,7 +1067,7 @@ static int __init debugfs_mips(void) arch_initcall(debugfs_mips); #endif -#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT) +#ifdef CONFIG_DMA_MAYBE_COHERENT /* User defined DMA coherency from command line. */ enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT; EXPORT_SYMBOL_GPL(coherentio); |