]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: mvebu: rename DT machine structure for Armada 370/XP
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 17 Feb 2014 14:23:20 +0000 (15:23 +0100)
committerJason Cooper <jason@lakedaemon.net>
Sat, 22 Feb 2014 00:41:08 +0000 (00:41 +0000)
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>
arch/arm/mach-mvebu/board-v7.c

index 304f5f8b39f66f2d1c6429f40d9b45c6f5bdada2..fa6fa2821f249ad1d7991ce8a2ec7fe2b2b1e2f3 100644 (file)
@@ -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,