aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2014-09-25 05:02:45 -0400
committerKukjin Kim <kgene.kim@samsung.com>2014-10-20 11:06:36 -0400
commit0d713cf1a6286aae6a12affab0887dbe2a4fbb83 (patch)
tree19a22890d12339ebfbd2d31fbe5843dc14cbc085 /arch/arm/plat-samsung
parent42d5dc37866610448453859bf2c4be57fce3834c (diff)
ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=y
Fix building of exynos_defconfig with CONFIG_PM_SLEEP disabled and CONFIG_ARM_EXYNOS_CPUIDLE enabled by: * adding EXYNOS_CPU_SUSPEND config option * always building sleep.o * building pm.o if EXYNOS_CPU_SUSPEND is enabled * moving suspend specific code from pm.c to suspend.c * enabling pm-common.o build also for EXYNOS_CPU_SUSPEND option [ Please note that there are no changes in the code moved from pm.c to suspend.c except making few functions non-static and cleaning up includes. ] Also while at it update Copyright dates. The build error messages: drivers/built-in.o: In function `exynos_enter_core0_aftr': /home/bzolnier/linux/drivers/cpuidle/cpuidle-exynos.c:36: undefined reference to `cpu_suspend' arch/arm/mach-exynos/built-in.o:(.data+0x74): undefined reference to `exynos_enter_aftr' make: *** [vmlinux] Error 1 This patch has been tested on Exynos4210 based Origen board. Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index f0a008496993..87746c37f030 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o
35# PM support 35# PM support
36 36
37obj-$(CONFIG_PM_SLEEP) += pm-common.o 37obj-$(CONFIG_PM_SLEEP) += pm-common.o
38obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o
38obj-$(CONFIG_SAMSUNG_PM) += pm.o 39obj-$(CONFIG_SAMSUNG_PM) += pm.o
39obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o 40obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o
40obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o 41obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o