aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p/Makefile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-08-06 21:34:55 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-08-06 21:34:55 +0900
commitf2b7e3c54a304677a1142829fb5913595885379f (patch)
tree1eb941524c7325672f947dab525d96228b362e20 /arch/arm/plat-s5p/Makefile
parent6b8eda04ffdc24b68d379a32358f4f09a425a380 (diff)
parent0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 (diff)
downloadmrst-s0i3-test-f2b7e3c54a304677a1142829fb5913595885379f.tar.gz
mrst-s0i3-test-f2b7e3c54a304677a1142829fb5913595885379f.tar.xz
mrst-s0i3-test-f2b7e3c54a304677a1142829fb5913595885379f.zip
Merge branch 'next-s5p' into for-next
Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c
Diffstat (limited to 'arch/arm/plat-s5p/Makefile')
-rw-r--r--arch/arm/plat-s5p/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 39c242bb9d5..7e34194b0aa 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -12,6 +12,7 @@ obj- :=
# Core files
+obj-y += dev-pmu.o
obj-y += dev-uart.o
obj-y += cpu.o
obj-y += clock.o