Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299511
b: refs/heads/master
c: f898fed
h: refs/heads/master
i:
  299509: 9733ef9
  299507: f414625
  299503: b85dc00
v: v3
  • Loading branch information
Nicolas Ferre committed Apr 17, 2012
1 parent 7c2375f commit 15beb56
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: 70756027b0a01cb0bebf2e20d8d28e8103025734
refs/heads/master: f898fed0c27b2d46c3d8331e7825c25b6432b9f4
5 changes: 2 additions & 3 deletions trunk/drivers/dma/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,10 @@ config DW_DMAC

config AT_HDMAC
tristate "Atmel AHB DMA support"
depends on ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
depends on ARCH_AT91
select DMA_ENGINE
help
Support the Atmel AHB DMA controller. This can be integrated in
chips such as the Atmel AT91SAM9RL.
Support the Atmel AHB DMA controller.

config FSL_DMA
tristate "Freescale Elo and Elo Plus DMA support"
Expand Down

0 comments on commit 15beb56

Please sign in to comment.