diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 18:08:37 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 18:08:37 -0500 |
| commit | 8077e8b059232f23fe51fdc42868dcd8ba293549 (patch) | |
| tree | 86eea03f30cd64a3da57245a61d5a3a04fdb2308 /drivers/char/tpm/Kconfig | |
| parent | 7845bc3964756240863ae453ffe4f7ee27ddc954 (diff) | |
| parent | b9e3238aa36db33aa0d0bd44ef85297c45627aac (diff) | |
Merge branch 'for-james' of git://github.com/srajiv/tpm into next
Diffstat (limited to 'drivers/char/tpm/Kconfig')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index fa567f1158c2..7fc75e47e6d0 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -27,6 +27,7 @@ if TCG_TPM | |||
| 27 | 27 | ||
| 28 | config TCG_TIS | 28 | config TCG_TIS |
| 29 | tristate "TPM Interface Specification 1.2 Interface" | 29 | tristate "TPM Interface Specification 1.2 Interface" |
| 30 | depends on X86 | ||
| 30 | ---help--- | 31 | ---help--- |
| 31 | If you have a TPM security chip that is compliant with the | 32 | If you have a TPM security chip that is compliant with the |
| 32 | TCG TIS 1.2 TPM specification say Yes and it will be accessible | 33 | TCG TIS 1.2 TPM specification say Yes and it will be accessible |
| @@ -35,6 +36,7 @@ config TCG_TIS | |||
| 35 | 36 | ||
| 36 | config TCG_NSC | 37 | config TCG_NSC |
| 37 | tristate "National Semiconductor TPM Interface" | 38 | tristate "National Semiconductor TPM Interface" |
| 39 | depends on X86 | ||
| 38 | ---help--- | 40 | ---help--- |
| 39 | If you have a TPM security chip from National Semiconductor | 41 | If you have a TPM security chip from National Semiconductor |
| 40 | say Yes and it will be accessible from within Linux. To | 42 | say Yes and it will be accessible from within Linux. To |