summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-10-14 23:31:13 -0700
committerOlof Johansson <olof@lixom.net>2014-10-14 23:31:13 -0700
commite17fd8e58a1eb39e23f29da065ccc1498f022ed7 (patch)
tree4ab0b1ad5f6b32d16cab7e0fd0005035ee9d1fbe /arch/arm/mm
parent6d81dc87c0fac76efabcde6884fcbe4cec874a83 (diff)
parentf6f1ae82bd288bceed5a93594a8a081845f11b41 (diff)
downloadlinux-e17fd8e58a1eb39e23f29da065ccc1498f022ed7.tar.gz
linux-e17fd8e58a1eb39e23f29da065ccc1498f022ed7.tar.bz2
linux-e17fd8e58a1eb39e23f29da065ccc1498f022ed7.zip
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung fixes for v3.18" from Kukjin Kim: - fix ifdef around cpu_*_do_[suspend, resume] ops to check CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP - fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n - fix enabling Samsung PM debug functionality due to recently merged patches and previous merge conflicts - fix pull-up setting in sd4_width8 pin group for exynos4x12 * tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n ARM: SAMSUNG: Restore Samsung PM Debug functionality ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-macros.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index ee1d80593958..ba1196c968d8 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -279,7 +279,7 @@ ENTRY(\name\()_processor_functions)
.if \suspend
.word cpu_\name\()_suspend_size
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
.word cpu_\name\()_do_suspend
.word cpu_\name\()_do_resume
#else