diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:01 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:01 +0200 |
| commit | 9415b93b35944bd01b80e7ab5ce64987e64c4666 (patch) | |
| tree | c20b491b569090aa7ed4785dd2ce71cd2db75ebe /Documentation | |
| parent | 4a73219ca2462546ab0dac4681f88bc5ba64561c (diff) | |
| parent | 5cf9896dc5c72a6c68c36140568b755f697f7760 (diff) | |
Merge tag 'v4.1.2' into toradex_vf_4.1-next
This is the 4.1.2 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt index 750d577e8083..f5a8ca29aff0 100644 --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt @@ -1,7 +1,7 @@ * Marvell Armada 370 / Armada XP Ethernet Controller (NETA) Required properties: -- compatible: should be "marvell,armada-370-neta". +- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta". - reg: address and length of the register set for the device. - interrupts: interrupt for the device - phy: See ethernet.txt file in the same directory. |