dma-mapping: merge direct and noncoherent ops

All the cache maintainance is already stubbed out when not enabled,
but merging the two allows us to nicely handle the case where
cache maintainance is required for some devices, but not others.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS parts

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1fb7b6d72baf..475d786a65b0 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -7,6 +7,7 @@ config SUPERH
         select ARCH_NO_COHERENT_DMA_MMAP if !MMU
         select HAVE_PATA_PLATFORM
         select CLKDEV_LOOKUP
+        select DMA_DIRECT_OPS
         select HAVE_IDE if HAS_IOPORT_MAP
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
@@ -158,13 +159,11 @@ config SWAP_IO_SPACE
         bool
 
 config DMA_COHERENT
-        select DMA_DIRECT_OPS
         bool
 
 config DMA_NONCOHERENT
         def_bool !DMA_COHERENT
         select ARCH_HAS_SYNC_DMA_FOR_DEVICE
-        select DMA_NONCOHERENT_OPS
 
 config PGTABLE_LEVELS
         default 3 if X2TLB