summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-17 15:23:20 +0100
committerJason Cooper <jason@lakedaemon.net>2014-02-22 00:41:08 +0000
commita017dbb6ee1b55a15ffffbc1aef0e782f96948c6 (patch)
tree2ca6447f50927b40b91b3fc81f2abd37a8430c46 /arch/arm
parent99b3d2946253713e8c7aa6544cb9474b0e226843 (diff)
downloadblackbird-op-linux-a017dbb6ee1b55a15ffffbc1aef0e782f96948c6.tar.gz
blackbird-op-linux-a017dbb6ee1b55a15ffffbc1aef0e782f96948c6.zip
ARM: mvebu: rename DT machine structure for Armada 370/XP
Due to a mistake made when merging Armada 370 and Armada XP DT machine structures, the name of the structure was incorrectly chosen as being ARMADA_XP_DT, while the structure also covers Armada 370. Therefore, we rename the structure to ARMADA_370_XP_DT. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/board-v7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index 304f5f8b39f6..fa6fa2821f24 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -82,7 +82,7 @@ static const char * const armada_370_xp_dt_compat[] = {
NULL,
};
-DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
+DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.smp = smp_ops(armada_xp_smp_ops),
.init_machine = mvebu_dt_init,
.init_time = mvebu_timer_and_clk_init,
OpenPOWER on IntegriCloud