From: Olof Johansson Date: Mon, 7 Oct 2013 17:55:23 +0000 (-0700) Subject: Merge tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~5047^2~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4e086f6797fd5319cce3df317eec28e34910d1d;p=firefly-linux-kernel-4.4.55.git Merge tag 'renesas-cleanup-for-v3.13' of git://git./linux/kernel/git/horms/renesas into next/cleanup From Simon Horman: Renesas ARM based SoC cleanups for v3.13 * Constify platform data and resources of r8a7790 SoC * Rename to r8a7790_init_delay() as r8a7790_init_early() - This is in preparation for doing more than just initialising the delay * Rename r8a73a4_init_delay() as r8a73a4_init_early() - This is in preparation for doing more than just initialising the delay * tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: Constify platform data and resources ARM: shmobile: Rename to r8a7790_init_early() ARM: shmobile: Rename to r8a73a4_init_early() Signed-off-by: Olof Johansson --- b4e086f6797fd5319cce3df317eec28e34910d1d diff --cc arch/arm/mach-shmobile/board-lager.c index 5930af8d434f,4047fac811c0..6569491839cf --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@@ -186,8 -161,8 +186,8 @@@ static const char *lager_boards_compat_ }; DT_MACHINE_START(LAGER_DT, "lager") - .init_early = r8a7790_init_delay, + .init_early = r8a7790_init_early, .init_time = r8a7790_timer_init, - .init_machine = lager_add_standard_devices, + .init_machine = lager_init, .dt_compat = lager_boards_compat_dt, MACHINE_END