MIPS: remove CONFIG_DMA_MAYBE_COHERENT

CONFIG_DMA_MAYBE_COHERENT just guards two early init options now.  Just
enable them unconditionally for CONFIG_DMA_NONCOHERENT.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a6d73c7..206d34b 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -184,7 +184,7 @@ config MIPS_ALCHEMY
        select CEVT_R4K
        select CSRC_R4K
        select IRQ_MIPS_CPU
-       select DMA_MAYBE_COHERENT       # Au1000,1500,1100 aren't, rest is
+       select DMA_NONCOHERENT          # Au1000,1500,1100 aren't, rest is
        select MIPS_FIXUP_BIGPHYS_ADDR if PCI
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_32BIT_KERNEL
@@ -548,7 +548,7 @@ config MIPS_MALTA
        select CLKSRC_MIPS_GIC
        select COMMON_CLK
        select CSRC_R4K
-       select DMA_MAYBE_COHERENT
+       select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PCI
@@ -1162,10 +1162,6 @@ config FW_CFE
 config ARCH_SUPPORTS_UPROBES
        bool
 
-config DMA_MAYBE_COHERENT
-       select DMA_NONCOHERENT
-       bool
-
 config DMA_PERDEV_COHERENT
        bool
        select ARCH_HAS_SETUP_DMA_OPS

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f0f5332..fb59188 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -801,7 +801,7 @@ static int __init debugfs_mips(void)
 arch_initcall(debugfs_mips);
 #endif
 
-#ifdef CONFIG_DMA_MAYBE_COHERENT
+#ifdef CONFIG_DMA_NONCOHERENT
 static int __init setcoherentio(char *str)
 {
        dma_default_coherent = true;