aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-vexpress/Makefile
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-05-03 14:24:39 +0100
committerJon Medhurst <tixy@linaro.org>2013-05-03 14:24:39 +0100
commit2991452354889cf001262b7aeee22e506d6a321e (patch)
tree7503e49ac04784f3a5e2812da614adfd4164a07b /arch/arm/mach-vexpress/Makefile
parentc65283a962e8e391283db37939f8483249b0d276 (diff)
parent892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff)
downloadvexpress-lsk-2991452354889cf001262b7aeee22e506d6a321e.tar.gz
Merge branch 'tracking-armlt-tc2-pm' into integration-linux-vexpress
Conflicts: arch/arm/mach-vexpress/Kconfig arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'arch/arm/mach-vexpress/Makefile')
-rw-r--r--arch/arm/mach-vexpress/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index f5b78d49246..fb3799e5d22 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -8,5 +8,7 @@ obj-y := v2m.o reset.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
CFLAGS_REMOVE_dcscb.o = -pg
+obj-$(CONFIG_ARCH_VEXPRESS_TC2) += tc2_pm.o tc2_pm_setup.o
+CFLAGS_REMOVE_tc2_pm.o = -pg
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o