From a59e057f8634dc03245ef391cd8791eb8efe6db4 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 21 Oct 2012 22:15:13 -0700 Subject: [PATCH] --- yaml --- r: 339967 b: refs/heads/master c: a41acc4ab923b2c3fd837669c45b87142fa88c9e h: refs/heads/master i: 339965: d6dcff0f658bbc757e81ce911422be7cb17a49bd 339963: bed66e0b0d14596e67055601c932b29c33f171db 339959: 77c2e1eb2619035e129df06d8d6b334806347908 339951: d8f7f8f15b7f3c305063e8fc6fceaabc9242e58a 339935: 13129f309ee51fc2742ee6d7698de2136fb4d60a 339903: 7bf64c10ce994fcee5dd36256ae7924abaf29f78 339839: f54353621b1b62d9692929723351c384037aa446 339711: 13ac476e4f72f1780b8b099f275b7bd3aab60fc8 339455: 05e8cd9412bdb85ffd57ff78a13899194f70a65e 338943: a8b5b06a001d4d6d40a154b41e6ff722d71aa1d9 337919: 69910e8087cd05a8058aafc312ec50b7273ccc8a 335871: 3e43c2f1c537ec292c9eb6ef6ca10dd05db0394f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20db4f7a99e1..edb2df47e2c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdc7594e5c5f7509a86b205edeedc58d72dd3999 +refs/heads/master: a41acc4ab923b2c3fd837669c45b87142fa88c9e diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7740.c b/trunk/arch/arm/mach-shmobile/setup-r8a7740.c index 11bb1d984197..9777e2daffd2 100644 --- a/trunk/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/trunk/arch/arm/mach-shmobile/setup-r8a7740.c @@ -747,7 +747,7 @@ static const char *r8a7740_boards_compat_dt[] __initdata = { NULL, }; -DT_MACHINE_START(SH7372_DT, "Generic R8A7740 (Flattened Device Tree)") +DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") .map_io = r8a7740_map_io, .init_early = r8a7740_add_early_devices_dt, .init_irq = r8a7740_init_irq,