commit d40c340622b3ae8aeb5a10cb521b9a6c934ba429
author Lucille Sylvester <lsylvest@codeaurora.org> Fri Sep 16 11:57:47 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:19:51 2011 -0700
tree 25f7eec834f267351a91affb7096c11f05336a98
parent dd93ecf782f7a88f5ffea62e7868254a1977797c

msm: kgsl: Make TZ usage depend on general SCM availability

SECURE_IO was an 8660 dependency, not a multi-platform feature.

Signed-off-by: Lucille Sylvester <lsylvest@codeaurora.org>

drivers/gpu/msm/kgsl_pwrscale_trustzone.c

diff --git a/drivers/gpu/msm/kgsl_pwrscale_trustzone.c b/drivers/gpu/msm/kgsl_pwrscale_trustzone.c
index d960da1..a6b37dd 100644
--- a/drivers/gpu/msm/kgsl_pwrscale_trustzone.c
+++ b/drivers/gpu/msm/kgsl_pwrscale_trustzone.c
@@ -33,7 +33,7 @@
 #define TZ_RESET_ID		0x3
 #define TZ_UPDATE_ID		0x4
 
-#ifdef CONFIG_MSM_SECURE_IO
+#ifdef CONFIG_MSM_SCM
 /* Trap into the TrustZone, and call funcs there. */
 static int __secure_tz_entry(u32 cmd, u32 val)
 {
@@ -45,7 +45,7 @@
 {
 	return 0;
 }
-#endif /* CONFIG_MSM_SECURE_IO */
+#endif /* CONFIG_MSM_SCM */
 
 static ssize_t tz_governor_show(struct kgsl_device *device,
 				struct kgsl_pwrscale *pwrscale,