From: Jon Medhurst <tixy@linaro.org>
Date: Wed, 17 Jul 2013 11:02:21 +0000 (+0100)
Subject: Merge branch 'tracking-armlt-tc2-psci' into lsk-3.10-vexpress
X-Git-Tag: firefly_0821_release~3680^2~236^2^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b3792f58beb849951acc7d2da15b48c8dd593fc4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'tracking-armlt-tc2-psci' into lsk-3.10-vexpress
---

b3792f58beb849951acc7d2da15b48c8dd593fc4
diff --cc arch/arm/mach-vexpress/Makefile
index c9ae195cc138,59cdec9cbd7e..14193dc7e6e8
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@@ -6,9 -6,11 +6,13 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  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
+ ifeq ($(CONFIG_ARCH_VEXPRESS_TC2),y)
+ obj-$(CONFIG_ARM_PSCI)			+= tc2_pm_psci.o
+ CFLAGS_REMOVE_tc2_pm_psci.o		= -pg
+ endif
  obj-$(CONFIG_SMP)			+= platsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o