aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShujuan Chen <shujuan.chen@stericsson.com>2010-06-21 15:32:59 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:44 -0600
commit016416a300768e5ac52d2fd969d9f7e5e1616be0 (patch)
tree41fbd8f4fafdc9ac5f87b4bdc1ed573827584d6a /arch
parente8704ac96d42a4f3093dc253b7f2b44cf8c150e8 (diff)
downloadlinux-2.6.34-ux500-016416a300768e5ac52d2fd969d9f7e5e1616be0.tar.gz
Fixing u5500_svp build error due to tee kernel patch. Updated with review comments!
ST-Ericsson Change ID: ER264554 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: Id39874bd04211a0590e94a5ad32f372974bad294 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2542 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-ux500/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index cb341b1e75b..f9fb079213a 100755
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -36,4 +36,6 @@ else
obj-$(CONFIG_MFD_STE_CONN) += ste_conn_devices.o
endif
-obj-$(CONFIG_TEE_SUPPORT) += tee_ux500.o
+ifndef CONFIG_MACH_U5500_SIMULATOR
+ obj-$(CONFIG_TEE_SUPPORT) += tee_ux500.o
+endif