summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-24 04:08:49 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-24 04:08:49 +0000
commit56580bb422e5f542da19c057f348dd39634138e7 (patch)
treeae02ad21b38d26b1675977a1d19e5da6fb69c52d /arch/arm/boot
parent4e76b1b2329b4a19adfacd187bc2920f68126a95 (diff)
parent73d9cdca1ced6ab32be363b58699039bd82b062a (diff)
downloadop-kernel-dev-56580bb422e5f542da19c057f348dd39634138e7.zip
op-kernel-dev-56580bb422e5f542da19c057f348dd39634138e7.tar.gz
Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
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 cb09d08..cf6c48a 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