diff options
| author | Tomasz Figa <t.figa@samsung.com> | 2014-03-20 18:59:30 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-20 23:17:17 +0100 |
| commit | 8dec067dc9c59f9fdcaf4357c22994cde3647eb8 (patch) | |
| tree | 1b82a9f2c23f4e65a8e3c071f82a57de4cee9a5b /arch/arm/mach-exynos/cpuidle.c | |
| parent | ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h (diff) | |
| download | linux-8dec067dc9c59f9fdcaf4357c22994cde3647eb8.tar.xz linux-8dec067dc9c59f9fdcaf4357c22994cde3647eb8.zip | |
ARM: EXYNOS: Fix compilation error in cpuidle.c
The big series refactoring Exynos suspend to RAM handling missed the
cpuidle driver that is disabled in exynos_defconfig, leaving it
including old mach/pm_core.h header and using old s3c_cpu_resume symbol
instead of new exynos_cpu_resume, resulting in compilation failures with
CONFIG_ARCH_EXYNOS and CONFIG_CPU_IDLE enabled.
This patch fixes that silly mistake and performs necessary modification
to arhc/arm/exynos/cpuidle.c to make it compile again.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/cpuidle.c')
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index f57cb91f02aa..b530231130a0 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -26,7 +26,6 @@ #include <plat/cpu.h> #include <plat/pm.h> -#include <mach/pm-core.h> #include <mach/map.h> #include "common.h" @@ -127,7 +126,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, /* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf(SYS_AFTR); - __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); + __raw_writel(virt_to_phys(exynos_cpu_resume), REG_DIRECTGO_ADDR); __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); save_cpu_arch_register(); |