Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[deliverable/linux.git] / arch / arm / mach-shmobile / board-lager-reference.c

diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 9c316a1b2e32a32b2e48e579e3af78da97f3a729..1a1a4a888632afb67fa47a532d3c251d3818fd65 100644 (file)
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -38,8 +38,9 @@ static const char *lager_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(LAGER_DT, "lager")
-       .init_early     = r8a7790_init_delay,
+       .smp            = smp_ops(r8a7790_smp_ops),
+       .init_early     = r8a7790_init_early,
+       .init_time      = rcar_gen2_timer_init,
        .init_machine   = lager_add_standard_devices,
-       .init_time      = r8a7790_timer_init,
        .dt_compat      = lager_boards_compat_dt,
 MACHINE_END