From ebf3f57d2e260aac6fc74a4233087910ebdd32c1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 24 Aug 2011 08:41:09 +0200 Subject: [PATCH] --- yaml --- r: 286097 b: refs/heads/master c: 8e2d41f8c85613a3739e8b2600ac2c66c08422f3 h: refs/heads/master i: 286095: 8f215b319c6162f77cd798157298daaa21a84eba v: v3 --- [refs] | 2 +- trunk/drivers/dma/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 339860b80809..70363eafbdc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb004294a934d030a9d716692a1dd6f677fc90e +refs/heads/master: 8e2d41f8c85613a3739e8b2600ac2c66c08422f3 diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig index ab8f469f5cf8..e514c4560f87 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 ARCH_MXC select DMA_ENGINE default y help @@ -216,11 +216,11 @@ config PCH_DMA config IMX_SDMA tristate "i.MX SDMA support" - depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5 + depends on ARCH_MXC select DMA_ENGINE help Support the i.MX SDMA engine. This engine is integrated into - Freescale i.MX25/31/35/51 chips. + Freescale i.MX25/31/35/51/53 chips. config IMX_DMA tristate "i.MX DMA support"