From e89476c686ed13ada7683d64750b19ca415a5a5b Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 28 Oct 2009 12:26:39 -0700
Subject: [PATCH] --- yaml --- r: 169162 b: refs/heads/master c:
 ff76ec18cabb12a6c8f3c65bd1d23f1a770fe908 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/tpm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7afd178db684..4424c3a458de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024e1a49411a1a7363e65db48edf1b09e9ee68ad
+refs/heads/master: ff76ec18cabb12a6c8f3c65bd1d23f1a770fe908
diff --git a/trunk/include/linux/tpm.h b/trunk/include/linux/tpm.h
index 8eaa8f83effb..ac5d1c1285d9 100644
--- a/trunk/include/linux/tpm.h
+++ b/trunk/include/linux/tpm.h
@@ -27,7 +27,7 @@
  */
 #define	TPM_ANY_NUM 0xFFFF
 
-#if defined(CONFIG_TCG_TPM)
+#if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE)
 
 extern int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf);
 extern int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash);