diff options
author | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2011-11-01 07:42:58 -0400 |
---|---|---|
committer | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2011-11-16 06:45:07 -0500 |
commit | 2f592f2a7d74c66763a6903edd04109132674d73 (patch) | |
tree | b7415d683708891d29f0cca252c96230300934d4 /drivers/char/tpm | |
parent | fd04886660208ab2e35baaca55588afa57d52c9c (diff) |
TPM: NSC and TIS drivers X86 dependency fix
A previous commit removed its PNP dependency, that in fact wasn't
necessary, but also allowed it be built for other architectures not
supported by it. This then caused kernel oops on PPC based machines.
I'm placing a x86 dependency back correctly.
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm')
-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 f6595aba4f0f..4d9273a1a781 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 |