diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:51:38 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:51:38 -0400 |
| commit | 1faca4ced8594d3586302e8d1788a60932f2bbca (patch) | |
| tree | 5130aaa4803a322f3d1f0ff6406f047ed0dba475 /drivers/char/tpm/Kconfig | |
| parent | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff) | |
| parent | 6b6844dd54e4196dd9818bc63b319f93c37a08be (diff) | |
Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2
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 |