diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 03:37:18 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 03:37:18 -0400 |
| commit | b967aecf1714c10d1e6c045e43b6385884f1ca77 (patch) | |
| tree | a6aebedea9c5ddd1bbaf42e913be01e17f98c735 /Documentation | |
| parent | 959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff) | |
| parent | 2abd5f1b97fce6e197be01d67a9567c7793c80d3 (diff) | |
Merge branch 'for-linus' into next
Conflicts:
drivers/dma/edma.c
Moved the memory leak fix post merge
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/atmel-dma.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/atmel-dma.txt b/Documentation/devicetree/bindings/dma/atmel-dma.txt index e1f343c7a34b..f69bcf5a6343 100644 --- a/Documentation/devicetree/bindings/dma/atmel-dma.txt +++ b/Documentation/devicetree/bindings/dma/atmel-dma.txt | |||
| @@ -28,7 +28,7 @@ The three cells in order are: | |||
| 28 | dependent: | 28 | dependent: |
| 29 | - bit 7-0: peripheral identifier for the hardware handshaking interface. The | 29 | - bit 7-0: peripheral identifier for the hardware handshaking interface. The |
| 30 | identifier can be different for tx and rx. | 30 | identifier can be different for tx and rx. |
| 31 | - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP. | 31 | - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 2 for ASAP. |
| 32 | 32 | ||
| 33 | Example: | 33 | Example: |
| 34 | 34 | ||