projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edf4f16 113522e)
Merge branch 'renesas/cleanup2' into next/soc
authorOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:43:40 +0000 (09:43 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:43:40 +0000 (09:43 -0700)
Merging in as base to resolve a merge conflict with later soc branch
locally.

1  2 
arch/arm/mach-shmobile/setup-r8a7790.c patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/smp-r8a7790.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index e1907686ace4abb0e09a80ee7c253b37e4edadc3,6bf84ec4890775cbab4a43727482d8634099a9b0..c37d82d38617ff9685e2480e5c0d426e5c2fe08b
--- 1/arch/arm/mach-shmobile/setup-r8a7790.c
--- 2/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -324,10 -319,8 +319,10 @@@ static const char * const r8a7790_board
  
  DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
        .smp            = smp_ops(r8a7790_smp_ops),
-       .init_early     = r8a7790_init_early,
+       .init_early     = shmobile_init_delay,
        .init_time      = rcar_gen2_timer_init,
 +      .init_late      = shmobile_init_late,
 +      .reserve        = rcar_gen2_reserve,
        .dt_compat      = r8a7790_boards_compat_dt,
  MACHINE_END
  #endif /* CONFIG_USE_OF */
diff --cc arch/arm/mach-shmobile/smp-r8a7790.c
Simple merge