summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos4/Makefile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-03-12 04:20:07 +0300
committerKukjin Kim <kgene.kim@samsung.com>2011-03-12 04:20:07 +0300
commitbe7004f73d0b42cca29cf9f1cc86f32038fd140c (patch)
tree906bfde445dd4d94e1487888440dfc31391dae30 /arch/arm/mach-exynos4/Makefile
parent604eefeb2308cda72325fd8754aecb55075ae866 (diff)
parent30fe76437bc2463b25e9a64ff1b28f293e3f3413 (diff)
downloadlinux-be7004f73d0b42cca29cf9f1cc86f32038fd140c.tar.xz
Merge branch 'next-exynos4-pm' into for-next
Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h
Diffstat (limited to 'arch/arm/mach-exynos4/Makefile')
-rw-r--r--arch/arm/mach-exynos4/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 69a4a28dc95e..9473adbb6c19 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -14,6 +14,7 @@ obj- :=
obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o
obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o
+obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o