summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 21:39:13 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 21:39:13 +0200
commit9bafc74163d8bccca9810159aab39be926fb877c (patch)
treebaa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s5pv210/Makefile
parentARM: memblock: setup lowmem mappings using memblock (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff)
downloadlinux-9bafc74163d8bccca9810159aab39be926fb877c.tar.xz
linux-9bafc74163d8bccca9810159aab39be926fb877c.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile')
-rw-r--r--arch/arm/mach-s5pv210/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 704548912408..ff1a0db57a2f 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -14,6 +14,8 @@ obj- :=
obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o gpiolib.o
obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o
+obj-$(CONFIG_S5PV210_PM) += pm.o sleep.o
+obj-$(CONFIG_CPU_FREQ) += cpufreq.o
# machine support
@@ -21,6 +23,7 @@ obj-$(CONFIG_MACH_AQUILA) += mach-aquila.o
obj-$(CONFIG_MACH_SMDKV210) += mach-smdkv210.o
obj-$(CONFIG_MACH_SMDKC110) += mach-smdkc110.o
obj-$(CONFIG_MACH_GONI) += mach-goni.o
+obj-$(CONFIG_MACH_TORBRECK) += mach-torbreck.o
# device support