diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
commit | baf41996d83a6ecd270be42ca1870592827fb30d (patch) | |
tree | fd59f83bdadfc43ed9b18b4ef5dc5f01f715d1fd /Documentation | |
parent | 8a95b5736641a5cd3996e4fe4c0af6ea05cfa86c (diff) | |
parent | b5bac1f597ae5669dee0d2ae927b8ded0b8f6b34 (diff) |
Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10
This is the 3.10.79 stable release
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt b/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt index a4873e5e3e36..e30e184f50c7 100644 --- a/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt @@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { 80 81 68 69 70 71 72 73 74 75 76 77>; - interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty", + interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty", "saif0", "saif1", "i2c0", "i2c1", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx"; |