From 3e67d9d948ddd83ef1abb58bf31306791f5ffee4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 12 Nov 2012 12:03:38 +0100 Subject: [PATCH] --- yaml --- r: 344325 b: refs/heads/master c: 8c4340fcfb3e40372101a608ccd906e456ed3fcd h: refs/heads/master i: 344323: 9cacef5d42048b255e83dd9b89be74e3cf340825 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mvebu/armada-370-xp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25aeaf10befd..66e4a9813d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61505e117bb5d626ed7db2e9daa791e184d81bd3 +refs/heads/master: 8c4340fcfb3e40372101a608ccd906e456ed3fcd diff --git a/trunk/arch/arm/mach-mvebu/armada-370-xp.c b/trunk/arch/arm/mach-mvebu/armada-370-xp.c index 29c27cd71018..a2f5bbc0d2e5 100644 --- a/trunk/arch/arm/mach-mvebu/armada-370-xp.c +++ b/trunk/arch/arm/mach-mvebu/armada-370-xp.c @@ -51,7 +51,7 @@ static const char * const armada_370_xp_dt_compat[] = { NULL, }; -DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") +DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .init_machine = armada_370_xp_dt_init, .map_io = armada_370_xp_map_io, .init_irq = armada_370_xp_init_irq,