summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajiv Andrade <srajiv@linux.vnet.ibm.com>2011-11-01 09:42:58 -0200
committerRajiv Andrade <srajiv@linux.vnet.ibm.com>2011-11-16 09:45:07 -0200
commit2f592f2a7d74c66763a6903edd04109132674d73 (patch)
treeb7415d683708891d29f0cca252c96230300934d4
parentfd04886660208ab2e35baaca55588afa57d52c9c (diff)
downloadlinux-2f592f2a7d74c66763a6903edd04109132674d73.tar.gz
linux-2f592f2a7d74c66763a6903edd04109132674d73.tar.bz2
linux-2f592f2a7d74c66763a6903edd04109132674d73.zip
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>
-rw-r--r--drivers/char/tpm/Kconfig2
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
config TCG_TIS
tristate "TPM Interface Specification 1.2 Interface"
+ depends on X86
---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
@@ -35,6 +36,7 @@ config TCG_TIS
config TCG_NSC
tristate "National Semiconductor TPM Interface"
+ depends on X86
---help---
If you have a TPM security chip from National Semiconductor
say Yes and it will be accessible from within Linux. To