Merge branch 'depends/rmk/for-linus' into samsung/dt

Conflicts:
	arch/arm/mach-exynos/Makefile
	arch/arm/mach-exynos/cpu.c -> common.c
	arch/arm/mach-exynos/include/mach/entry-macro.S
	arch/arm/mach-exynos/init.c -> common.c
	arch/arm/mach-s5p64x0/init.c -> common.c
	arch/arm/mach-s5pv210/init.c -> common.c

Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index ab8f469f5cf8..5a99bb3f255a 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -124,7 +124,7 @@ config MV_XOR
 
 config MX3_IPU
         bool "MX3x Image Processing Unit support"
-        depends on ARCH_MX3
+        depends on SOC_IMX31 || SOC_IMX35
         select DMA_ENGINE
         default y
         help
@@ -216,7 +216,7 @@ config PCH_DMA
 
 config IMX_SDMA
         tristate "i.MX SDMA support"
-        depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5
+        depends on ARCH_MX25 || SOC_IMX31 || SOC_IMX35 || ARCH_MX5
         select DMA_ENGINE
         help
           Support the i.MX SDMA engine. This engine is integrated into