diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
| commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
| tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/mach-exynos/cpuidle.c | |
| parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
| parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
| download | linux-fsl-qoriq-929d138a3ba776145d2f421c2c4f16d922535090.tar.xz | |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/mach-exynos/cpuidle.c')
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 26dac28..cff0595 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -100,7 +100,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, exynos4_set_wakeupmask(); /* Set value of power down register for aftr mode */ - exynos4_sys_powerdown_conf(SYS_AFTR); + exynos_sys_powerdown_conf(SYS_AFTR); __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); |