diff options
| author | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /drivers/char | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/char')
| -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 3738cfa209ff..f5fc64f89c5c 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -6,6 +6,7 @@ menuconfig TCG_TPM | |||
| 6 | tristate "TPM Hardware Support" | 6 | tristate "TPM Hardware Support" |
| 7 | depends on HAS_IOMEM | 7 | depends on HAS_IOMEM |
| 8 | depends on EXPERIMENTAL | 8 | depends on EXPERIMENTAL |
| 9 | select SECURITYFS | ||
| 9 | ---help--- | 10 | ---help--- |
| 10 | If you have a TPM security chip in your system, which | 11 | If you have a TPM security chip in your system, which |
| 11 | implements the Trusted Computing Group's specification, | 12 | implements the Trusted Computing Group's specification, |