From: Kylene Jo Hall <kjhall@us.ibm.com>
Date: Mon, 15 May 2006 16:43:53 +0000 (-0700)
Subject: [PATCH] tpm: update module dependencies
X-Git-Tag: v2.6.17-rc5~153
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=94585136606e0598a93ec145d9a899c8ec9b2208;p=~shefty%2Frdma-dev.git

[PATCH] tpm: update module dependencies

The TIS driver is dependent upon information from the ACPI table for device
discovery thus it compiles but does no actual work without this dependency.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 1efde3b2761..fe00c7dfb64 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -22,7 +22,7 @@ config TCG_TPM
 
 config TCG_TIS
 	tristate "TPM Interface Specification 1.2 Interface"
-	depends on TCG_TPM
+	depends on TCG_TPM && PNPACPI
 	---help---
 	  If you have a TPM security chip that is compliant with the
 	  TCG TIS 1.2 TPM specification say Yes and it will be accessible