diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
| commit | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (patch) | |
| tree | fd2a441a7528003e0876ef0a4209cd7d9e28e7bc /dts/src/arm/armada-385.dtsi | |
| parent | 8b464dc6eec4d1fd58875451671456393181e980 (diff) | |
| parent | e8ee06fe59e468dcd7404b8eed75d78af9c02593 (diff) | |
| download | barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.gz barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.xz | |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/armada-385.dtsi')
| -rw-r--r-- | dts/src/arm/armada-385.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/src/arm/armada-385.dtsi b/dts/src/arm/armada-385.dtsi index f011009bf4..6283d7912f 100644 --- a/dts/src/arm/armada-385.dtsi +++ b/dts/src/arm/armada-385.dtsi @@ -16,7 +16,7 @@ / { model = "Marvell Armada 385 family SoC"; - compatible = "marvell,armada385", "marvell,armada38x"; + compatible = "marvell,armada385", "marvell,armada380"; cpus { #address-cells = <1>; |