From a5f9b19f62d649d861e3ec94a51c3a9ba48bb540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 13 Dec 2011 15:12:55 +0100 Subject: [PATCH] --- yaml --- r: 277066 b: refs/heads/master c: eb444fee92895cd793911b002b7e56795caf9914 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e15d29defa11..49cc1b6946f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83f250625b44dead19d8479b315815698f348c05 +refs/heads/master: eb444fee92895cd793911b002b7e56795caf9914 diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig index ab8f469f5cf8..5a99bb3f255a 100644 --- a/trunk/drivers/dma/Kconfig +++ b/trunk/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