From 14c13c1ac27bf44479836aeaa8aa5c4c34f1b8bb Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 2 Feb 2012 10:12:00 +0800 Subject: [PATCH] --- yaml --- r: 296051 b: refs/heads/master c: 89857353f9264785517393753ec9e77dba144734 h: refs/heads/master i: 296049: bbf110ae2c35d8df15706235fd5ce9df5532232e 296047: 4fc8eb403b7a7b716ca7f981b553f62be7db3be2 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/dma.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 693c524dbe00..a0a86f21e31b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdaf29cfd8d76bc6133b1a1d127d029a966df66c +refs/heads/master: 89857353f9264785517393753ec9e77dba144734 diff --git a/trunk/arch/arm/plat-mxc/include/mach/dma.h b/trunk/arch/arm/plat-mxc/include/mach/dma.h index 233d0a5e2d68..1b9080385b46 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/dma.h +++ b/trunk/arch/arm/plat-mxc/include/mach/dma.h @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || + return strstr(dev_name(chan->device->dev), "sdma") || !strcmp(dev_name(chan->device->dev), "imx-dma"); }