diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-22 10:50:55 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-22 10:50:55 +0100 |
| commit | a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68 (patch) | |
| tree | ccc6042af17706823bc1ccacf931310a9e6ec487 /arch/arm/boot | |
| parent | ARM: mvebu: update defconfig with I2C and RTC support (diff) | |
| parent | arm: mvebu: fix typo in machine name for Armada 370/XP (diff) | |
| download | linux-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.tar.xz linux-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.zip | |
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.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 70c35f8ccf90..be175f8b3e3e 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 { |