Merge branch 'for-next-arm-dma' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/dma-mapping.c

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cbbbc45f6b67..24d3302a1b8e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -4,6 +4,7 @@ config ARM
         select HAVE_AOUT
         select HAVE_DMA_API_DEBUG
         select HAVE_IDE if PCI || ISA || PCMCIA
+        select HAVE_DMA_ATTRS
         select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)
         select CMA if (CPU_V6 || CPU_V6K || CPU_V7)
         select HAVE_MEMBLOCK
@@ -47,6 +48,14 @@ config ARM
 config ARM_HAS_SG_CHAIN
         bool
 
+config NEED_SG_DMA_LENGTH
+        bool
+
+config ARM_DMA_USE_IOMMU
+        select NEED_SG_DMA_LENGTH
+        select ARM_HAS_SG_CHAIN
+        bool
+
 config HAVE_PWM
         bool