diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:30:38 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:30:38 -0500 |
| commit | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (patch) | |
| tree | faf5312c25eebfa11bd1f65c881bfac07c945f2b /drivers/char/tpm/Kconfig | |
| parent | 67cb6e842e7f1e534a5e0e8708a8779e33b60520 (diff) | |
| parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/tpm/Kconfig')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index b58adfe3ed19..a6873bf89ffa 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -6,7 +6,7 @@ menu "TPM devices" | |||
| 6 | 6 | ||
| 7 | config TCG_TPM | 7 | config TCG_TPM |
| 8 | tristate "TPM Hardware Support" | 8 | tristate "TPM Hardware Support" |
| 9 | depends on EXPERIMENTAL && PCI | 9 | depends on EXPERIMENTAL |
| 10 | ---help--- | 10 | ---help--- |
| 11 | If you have a TPM security chip in your system, which | 11 | If you have a TPM security chip in your system, which |
| 12 | implements the Trusted Computing Group's specification, | 12 | implements the Trusted Computing Group's specification, |