---

yaml --- r: 329094 b: refs/heads/master c: 20328b5 h: refs/heads/master v: v3
git-mirror · Aug 22, 2012 · 50fc2e6 · 50fc2e6
1 parent f2b1653
commit 50fc2e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5df39262dd59dbbffb1017fca0f1661408ac9d5
+refs/heads/master: 20328b56cdf8fcc79f28c6c50ad8190fc0779e80
diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig
@@ -11,6 +11,7 @@ config IMA
 	select CRYPTO_SHA1
 	select TCG_TPM if HAS_IOMEM && !UML
 	select TCG_TIS if TCG_TPM && X86
+	select TCG_IBMVTPM if TCG_TPM && PPC64
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash