Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 286097
b: refs/heads/master
c: 8e2d41f
h: refs/heads/master
i:
  286095: 8f215b3
v: v3
  • Loading branch information
Sascha Hauer authored and Vinod Koul committed Nov 17, 2011
1 parent b8dd819 commit ebf3f57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dbb004294a934d030a9d716692a1dd6f677fc90e
refs/heads/master: 8e2d41f8c85613a3739e8b2600ac2c66c08422f3
6 changes: 3 additions & 3 deletions trunk/drivers/dma/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit ebf3f57

Please sign in to comment.