aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-29 04:03:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:26 -0400
commitcedb27de0450fef73bc7dc28431d1108af54134c (patch)
tree60f94098f7eb8b27f3525b894c2babb9687f200a /drivers/char/tpm
parent4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3 (diff)
tpm: change Kconfig dependencies from PNPACPI to PNP
There is no "PNPACPI" driver interface as such. PNPACPI is an internal backend of PNP, and drivers just use the generic PNP interface. The drivers should depend on CONFIG_PNP, not CONFIG_PNPACPI. tpm_nsc.c doesn't use PNP at all, so we can just remove the dependency completely. It probably *should* use PNP to discover the device, but until it does, there's no point in depending on PNP. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Kylene Jo Hall <kjhall@us.ibm.com> Cc: Marcel Selhorst <tpm@selhorst.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 8f3f7620f95a..3738cfa209ff 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -23,7 +23,7 @@ if TCG_TPM
23 23
24config TCG_TIS 24config TCG_TIS
25 tristate "TPM Interface Specification 1.2 Interface" 25 tristate "TPM Interface Specification 1.2 Interface"
26 depends on PNPACPI 26 depends on PNP
27 ---help--- 27 ---help---
28 If you have a TPM security chip that is compliant with the 28 If you have a TPM security chip that is compliant with the
29 TCG TIS 1.2 TPM specification say Yes and it will be accessible 29 TCG TIS 1.2 TPM specification say Yes and it will be accessible
@@ -32,7 +32,6 @@ config TCG_TIS
32 32
33config TCG_NSC 33config TCG_NSC
34 tristate "National Semiconductor TPM Interface" 34 tristate "National Semiconductor TPM Interface"
35 depends on PNPACPI
36 ---help--- 35 ---help---
37 If you have a TPM security chip from National Semiconductor 36 If you have a TPM security chip from National Semiconductor
38 say Yes and it will be accessible from within Linux. To 37 say Yes and it will be accessible from within Linux. To
@@ -48,7 +47,7 @@ config TCG_ATMEL
48 47
49config TCG_INFINEON 48config TCG_INFINEON
50 tristate "Infineon Technologies TPM Interface" 49 tristate "Infineon Technologies TPM Interface"
51 depends on PNPACPI 50 depends on PNP
52 ---help--- 51 ---help---
53 If you have a TPM security chip from Infineon Technologies 52 If you have a TPM security chip from Infineon Technologies
54 (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it 53 (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it