diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
| commit | 2f540738f8d228016c6cd0d3b303896c174ecee3 (patch) | |
| tree | 7e6574c041ac4386763f94d3d401d70f4ab6f55b /drivers/char/tpm/Kconfig | |
| parent | a3849a4c038a21075a0bc7eaf37f65a93976d10c (diff) | |
| parent | d8e9c00e38f6947cef7f5466a0a3d369461ab97f (diff) | |
Merge branch 'tegra/cleanup' into next/cleanup
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 f6595aba4f0f..fa567f1158c2 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 |