diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /drivers/char/tpm/Kconfig | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
| download | linux-29f147d746326e4db5fe350c70373081d61a2965.tar.gz | |
Merge branch 'merge'
Diffstat (limited to 'drivers/char/tpm/Kconfig')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index a6873bf89ffad6..1efde3b27619b4 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -20,9 +20,18 @@ config TCG_TPM Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI and CONFIG_PNPACPI. +config TCG_TIS + tristate "TPM Interface Specification 1.2 Interface" + depends on TCG_TPM + ---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 + from within Linux. To compile this driver as a module, choose + M here; the module will be called tpm_tis. + config TCG_NSC tristate "National Semiconductor TPM Interface" - depends on TCG_TPM + depends on TCG_TPM && PNPACPI ---help--- If you have a TPM security chip from National Semicondutor say Yes and it will be accessible from within Linux. To |