From: Olof Johansson <olof@lixom.net>
Date: Sat, 12 Jul 2014 16:43:40 +0000 (-0700)
Subject: Merge branch 'renesas/cleanup2' into next/soc
X-Git-Tag: v3.17-rc1~79^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1ddcdef841f68d175b1a4a5c91d55f383ce5241;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'renesas/cleanup2' into next/soc

Merging in as base to resolve a merge conflict with later soc branch
locally.
---

e1ddcdef841f68d175b1a4a5c91d55f383ce5241
diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index e1907686ace4a,6bf84ec489077..c37d82d38617f
--- a/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 */