Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296051
b: refs/heads/master
c: 8985735
h: refs/heads/master
i:
  296049: bbf110a
  296047: 4fc8eb4
v: v3
  • Loading branch information
Richard Zhao authored and Shawn Guo committed Feb 27, 2012
1 parent 970cf9f commit 14c13c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cdaf29cfd8d76bc6133b1a1d127d029a966df66c
refs/heads/master: 89857353f9264785517393753ec9e77dba144734
3 changes: 1 addition & 2 deletions trunk/arch/arm/plat-mxc/include/mach/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down

0 comments on commit 14c13c1

Please sign in to comment.