diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 21:23:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 21:23:24 -0700 |
| commit | 65d3977b6593d5506d711acb332d4bd09c986201 (patch) | |
| tree | c2d40590036203677c75708cc2529061b6830718 | |
| parent | e87d10b29f459e23964b14fe2300f808c5b6282e (diff) | |
| parent | d358c99838f3cf63ad7536124be4318cc84b11fa (diff) | |
| download | op-kernel-dev-65d3977b6593d5506d711acb332d4bd09c986201.zip op-kernel-dev-65d3977b6593d5506d711acb332d4bd09c986201.tar.gz | |
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>
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp-apmu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index a05b16d..2c06810 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -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 |
