Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bjorn Helgaas and committed by
Linus Torvalds
cedb27de 4821cd11

+2 -3
+2 -3
drivers/char/tpm/Kconfig
··· 23 23 24 24 config TCG_TIS 25 25 tristate "TPM Interface Specification 1.2 Interface" 26 - depends on PNPACPI 26 + depends on PNP 27 27 ---help--- 28 28 If you have a TPM security chip that is compliant with the 29 29 TCG TIS 1.2 TPM specification say Yes and it will be accessible ··· 32 32 33 33 config TCG_NSC 34 34 tristate "National Semiconductor TPM Interface" 35 - depends on PNPACPI 36 35 ---help--- 37 36 If you have a TPM security chip from National Semiconductor 38 37 say Yes and it will be accessible from within Linux. To ··· 47 48 48 49 config TCG_INFINEON 49 50 tristate "Infineon Technologies TPM Interface" 50 - depends on PNPACPI 51 + depends on PNP 51 52 ---help--- 52 53 If you have a TPM security chip from Infineon Technologies 53 54 (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it