diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2014-12-05 19:31:32 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-05 19:31:32 +0530 |
| commit | 939b6ef378bfb6fd9cff61a1f3afa17e84ea0884 (patch) | |
| tree | a01ba87fda921e8e60e4d938b0cf0d8d7fd37868 /Documentation | |
| parent | dmaengine: k3dma: Add CONFIG_PM_SLEEP to suspend/resume functions (diff) | |
| parent | dmaengine: at_xdmac: Add DMA_PRIVATE (diff) | |
| download | linux-dev-939b6ef378bfb6fd9cff61a1f3afa17e84ea0884.tar.xz linux-dev-939b6ef378bfb6fd9cff61a1f3afa17e84ea0884.zip | |
Merge branch 'topic/at_xdmac' into for-linus
Diffstat (limited to 'Documentation')
| -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 { compatible = "atmel,sama5d4-dma"; reg = <0xf0004000 0x200>; interrupts = <50 4 0>; - #dma-cells = <2>; + #dma-cells = <1>; }; |