Skip to content

Commit

Permalink
tpm: change Kconfig dependencies from PNPACPI to PNP
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Kylene Jo Hall <[email protected]>
Cc: Marcel Selhorst <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Bjorn Helgaas authored and torvalds committed Apr 29, 2008
1 parent 4821cd1 commit cedb27d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/char/tpm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if TCG_TPM

config TCG_TIS
tristate "TPM Interface Specification 1.2 Interface"
depends on PNPACPI
depends on PNP
---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
Expand All @@ -32,7 +32,6 @@ config TCG_TIS

config TCG_NSC
tristate "National Semiconductor TPM Interface"
depends on PNPACPI
---help---
If you have a TPM security chip from National Semiconductor
say Yes and it will be accessible from within Linux. To
Expand All @@ -48,7 +47,7 @@ config TCG_ATMEL

config TCG_INFINEON
tristate "Infineon Technologies TPM Interface"
depends on PNPACPI
depends on PNP
---help---
If you have a TPM security chip from Infineon Technologies
(either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
Expand Down

0 comments on commit cedb27d

Please sign in to comment.