tpm: change Kconfig dependencies from PNPACPI to PNP (cedb27de) · Commits · 戴 / test

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>

drivers/char/tpm/Kconfig

+2 −3

Original line number	Diff line number	Diff line
		@@ -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
		@@ -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
		@@ -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

Admin message