Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277066
b: refs/heads/master
c: eb444fe
h: refs/heads/master
v: v3
  • Loading branch information
Eric Bénard authored and Sascha Hauer committed Dec 19, 2011
1 parent 415702c commit a5f9b19
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 83f250625b44dead19d8479b315815698f348c05
refs/heads/master: eb444fee92895cd793911b002b7e56795caf9914
4 changes: 2 additions & 2 deletions trunk/drivers/dma/Kconfig
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 SOC_IMX31 || SOC_IMX35
select DMA_ENGINE
default y
help
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a5f9b19

Please sign in to comment.