diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:43 +0000 |
| commit | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (patch) | |
| tree | 6ed53e819e5c763f751ff968a650b236d2d02545 /Documentation | |
| parent | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff) | |
| parent | 1569265782ef26ed77ce45ebeb0676f11d4c114a (diff) | |
Merge tag 'v3.10.29' into linux-linaro-lsk
This is the 3.10.29 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/ata/marvell.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt index b5cdd20cde9..1c8351604d3 100644 --- a/Documentation/devicetree/bindings/ata/marvell.txt +++ b/Documentation/devicetree/bindings/ata/marvell.txt @@ -1,7 +1,7 @@ * Marvell Orion SATA Required Properties: -- compatibility : "marvell,orion-sata" +- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata" - reg : Address range of controller - interrupts : Interrupt controller is using - nr-ports : Number of SATA ports in use. |