diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
| commit | 5abe65e3d67aac9f9b5c08660f817a2d6ec5515f (patch) | |
| tree | 7422d99151ab4967a4b0f1783a156e6a1527ccde /arch/arm/boot/dts/armada-380.dtsi | |
| parent | ba364fc752daeded072a5ef31e43b84cb1f9e5fd (diff) | |
| parent | a728b977429383b3fe92b6e3bff9e69365609e0f (diff) | |
| download | talos-obmc-linux-5abe65e3d67aac9f9b5c08660f817a2d6ec5515f.tar.gz talos-obmc-linux-5abe65e3d67aac9f9b5c08660f817a2d6ec5515f.zip | |
Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
Diffstat (limited to 'arch/arm/boot/dts/armada-380.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-380.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi index e69bc6759c39..4173a8ab34e7 100644 --- a/arch/arm/boot/dts/armada-380.dtsi +++ b/arch/arm/boot/dts/armada-380.dtsi @@ -16,7 +16,7 @@ / { model = "Marvell Armada 380 family SoC"; - compatible = "marvell,armada380", "marvell,armada38x"; + compatible = "marvell,armada380"; cpus { #address-cells = <1>; |
