diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-04-29 01:03:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:26 -0700 |
| commit | cedb27de0450fef73bc7dc28431d1108af54134c (patch) | |
| tree | 60f94098f7eb8b27f3525b894c2babb9687f200a /drivers/char | |
| parent | 4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3 (diff) | |
| download | kernel_samsung_tuna-cedb27de0450fef73bc7dc28431d1108af54134c.zip kernel_samsung_tuna-cedb27de0450fef73bc7dc28431d1108af54134c.tar.gz kernel_samsung_tuna-cedb27de0450fef73bc7dc28431d1108af54134c.tar.bz2 | |
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')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 8f3f762..3738cfa 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -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 |