diff options
author | 2011-11-09 17:02:13 -0800 | |
---|---|---|
committer | 2011-11-09 17:02:13 -0800 | |
commit | 3cdc3acc62527ab9544c2820b5e5da482a105240 (patch) | |
tree | 72e204d29562c5233517d5b84cbe72dd3e5d213b /arch/arm/mach-msm/Makefile | |
parent | Merge branch 'for-3.2/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | ARM: msm: fix compilation flags for MSM_SCM (diff) | |
download | linux-3cdc3acc62527ab9544c2820b5e5da482a105240.tar.gz linux-3cdc3acc62527ab9544c2820b5e5da482a105240.tar.bz2 linux-3cdc3acc62527ab9544c2820b5e5da482a105240.zip |
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
-rw-r--r-- | arch/arm/mach-msm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 4285dfd80b6f..4ad3969b9881 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -15,6 +15,8 @@ obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o obj-$(CONFIG_MSM_SMD) += last_radio_log.o obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) + obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o |