diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-12-05 09:01:32 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-05 09:01:32 -0500 |
| commit | 939b6ef378bfb6fd9cff61a1f3afa17e84ea0884 (patch) | |
| tree | a01ba87fda921e8e60e4d938b0cf0d8d7fd37868 /Documentation/devicetree/bindings/dma | |
| parent | af2d3139e19fd7da9a5d300a83812616b2d6694c (diff) | |
| parent | fef4cbf2ab830fcd695d892927386ad9ccc46339 (diff) | |
Merge branch 'topic/at_xdmac' into for-linus
Diffstat (limited to 'Documentation/devicetree/bindings/dma')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/atmel-xdma.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/atmel-xdma.txt b/Documentation/devicetree/bindings/dma/atmel-xdma.txt index e75c128c53fa..0eb2b3207e08 100644 --- a/Documentation/devicetree/bindings/dma/atmel-xdma.txt +++ b/Documentation/devicetree/bindings/dma/atmel-xdma.txt | |||
| @@ -22,7 +22,7 @@ dma1: dma-controller@f0004000 { | |||
| 22 | compatible = "atmel,sama5d4-dma"; | 22 | compatible = "atmel,sama5d4-dma"; |
| 23 | reg = <0xf0004000 0x200>; | 23 | reg = <0xf0004000 0x200>; |
| 24 | interrupts = <50 4 0>; | 24 | interrupts = <50 4 0>; |
| 25 | #dma-cells = <2>; | 25 | #dma-cells = <1>; |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | 28 | ||