summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 10:50:55 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 10:50:55 +0100
commita79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68 (patch)
treeccc6042af17706823bc1ccacf931310a9e6ec487 /arch/arm/boot
parent9bfd143ed247fc7a9e0573dc1fbaf6d124b5cac9 (diff)
parent8c4340fcfb3e40372101a608ccd906e456ed3fcd (diff)
downloadop-kernel-dev-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.zip
op-kernel-dev-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.tar.gz
Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 70c35f8..be175f8 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -20,7 +20,7 @@
/ {
model = "Marvell Armada 370 and XP SoC";
- compatible = "marvell,armada_370_xp";
+ compatible = "marvell,armada-370-xp";
cpus {
cpu@0 {
OpenPOWER on IntegriCloud