Commit 65d3977b authored Jul 12, 2014 by Olof Johansson

Merge tag 'renesas-soc3-for-v3.17' of...

Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:

- Correct build failure in APMU code in the case of !SUSPEND

* tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND

Signed-off-by: Olof Johansson <olof@lixom.net>

parents e87d10b2 d358c998

arch/arm/mach-shmobile/platsmp-apmu.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -244,6 +244,4 @@ void __init shmobile_smp_apmu_suspend_init(void)
		{
		shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend;
		}
		#else
		void shmobile_smp_apmu_suspend_init(void) {}
		#endif