From: Arnd Bergmann Date: Fri, 5 Sep 2014 15:42:18 +0000 (+0200) Subject: Merge tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=013c5b4e6611746725cbcc0c39922d36d2968d50;p=linux-beck.git Merge tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Cleanup Updates for v3.18" from Simon Horman: * Remove Genmai board code Signed-off-by: Arnd Bergmann * tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: Remove legacy board support ARM: shmobile: r7s72100: genmai: Remove legacy board file ARM: shmobile: r7s72100: genmai: Remove reference board file --- 013c5b4e6611746725cbcc0c39922d36d2968d50 diff --cc arch/arm/mach-shmobile/setup-r7s72100.c index 46a93f73ee4a,111437df8eb6..4122104359f9 --- a/arch/arm/mach-shmobile/setup-r7s72100.c +++ b/arch/arm/mach-shmobile/setup-r7s72100.c @@@ -32,7 -31,5 +31,6 @@@ static const char *r7s72100_boards_comp DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)") .init_early = shmobile_init_delay, + .init_late = shmobile_init_late, .dt_compat = r7s72100_boards_compat_dt, MACHINE_END - #endif /* CONFIG_USE_OF */