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