diff --git a/[refs] b/[refs]
index 8f1d588a8fbc..8275687c349a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 982e617a313b57abee3bcfa53381c356d00fd64a
+refs/heads/master: 1d714057ef8f6348eba7b28ace6d307513e57cef
diff --git a/trunk/security/integrity/evm/Kconfig b/trunk/security/integrity/evm/Kconfig
index 884617d4aad0..afbb59dd262d 100644
--- a/trunk/security/integrity/evm/Kconfig
+++ b/trunk/security/integrity/evm/Kconfig
@@ -1,11 +1,10 @@
 config EVM
 	boolean "EVM support"
-	depends on SECURITY && KEYS && TCG_TPM
+	depends on SECURITY && KEYS && (TRUSTED_KEYS=y || TRUSTED_KEYS=n)
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
 	select ENCRYPTED_KEYS
-	select TRUSTED_KEYS
 	default n
 	help
 	  EVM protects a file's security extended attributes against