diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 04:08:49 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 04:08:49 +0000 |
| commit | 56580bb422e5f542da19c057f348dd39634138e7 (patch) | |
| tree | ae02ad21b38d26b1675977a1d19e5da6fb69c52d /arch/arm/boot | |
| parent | 4e76b1b2329b4a19adfacd187bc2920f68126a95 (diff) | |
| parent | 73d9cdca1ced6ab32be363b58699039bd82b062a (diff) | |
| download | talos-obmc-linux-56580bb422e5f542da19c057f348dd39634138e7.tar.gz talos-obmc-linux-56580bb422e5f542da19c057f348dd39634138e7.zip | |
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.dtsi | 2 |
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 cb09d0882c3d..cf6c48a09eac 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 { |
