diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
| commit | c5b970dd2f809ce3675902f672a1d676aed43c7a (patch) | |
| tree | 89311b14d29ab1d8ea2966e22941ac5b2214db25 /arch/arm/mach-vexpress/Makefile | |
| parent | 3bc528d32c5c98a496c3473353e701a6e23c0cb3 (diff) | |
| parent | 892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.9-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/Makefile | 2 |
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 |