summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-05-15 18:43:53 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 20:20:54 +0200
commit94585136606e0598a93ec145d9a899c8ec9b2208 (patch)
treeae20ed8b78f9ef2e12ec02eac7380942e6860ca2 /drivers
parent[PATCH] Fix capi reload by unregistering the correct major (diff)
downloadlinux-94585136606e0598a93ec145d9a899c8ec9b2208.tar.xz
linux-94585136606e0598a93ec145d9a899c8ec9b2208.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 1efde3b27619..fe00c7dfb649 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