diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /drivers/char/tpm/Kconfig | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'drivers/char/tpm/Kconfig')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index f6595aba4f0..fa567f1158c 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -43,6 +43,7 @@ config TCG_NSC | |||
| 43 | 43 | ||
| 44 | config TCG_ATMEL | 44 | config TCG_ATMEL |
| 45 | tristate "Atmel TPM Interface" | 45 | tristate "Atmel TPM Interface" |
| 46 | depends on PPC64 || HAS_IOPORT | ||
| 46 | ---help--- | 47 | ---help--- |
| 47 | If you have a TPM security chip from Atmel say Yes and it | 48 | If you have a TPM security chip from Atmel say Yes and it |
| 48 | will be accessible from within Linux. To compile this driver | 49 | will be accessible from within Linux. To compile this driver |