diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:16 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:16 +0100 |
| commit | 3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc (patch) | |
| tree | 3c2b654751fed47261fa77fb2571e0c7897bbfce /arch/arm/mach-vexpress/Makefile | |
| parent | 08f87fd1f8d4c4bb7bc2473e63e01841997575a0 (diff) | |
| parent | dd94c6f646873c2f16b70e1cc82451fe1c2a83c6 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress
Conflicts:
arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'arch/arm/mach-vexpress/Makefile')
| -rw-r--r-- | arch/arm/mach-vexpress/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile index c298f7c0799..c9ae195cc13 100644 --- a/arch/arm/mach-vexpress/Makefile +++ b/arch/arm/mach-vexpress/Makefile @@ -8,5 +8,7 @@ obj-y := v2m.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 |