diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 15:44:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 15:44:43 -0400 |
| commit | c54dcd8ec9f05c8951d1e622e90904aef95379f9 (patch) | |
| tree | 6f657b3ec509975c0f295197156e2bbc530457a2 /drivers | |
| parent | b11ce8a26d26ed9019a8803aa90d580b52f23e79 (diff) | |
| parent | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()
selinux: use default proc sid on symlinks
file capabilities: uninline cap_safe_nice
Update selinux info in MAINTAINERS and Kconfig help text
SELinux: add gitignore file for mdp script
SELinux: add boundary support and thread context assignment
securityfs: do not depend on CONFIG_SECURITY
selinux: add support for installing a dummy policy (v2)
security: add/fix security kernel-doc
selinux: Unify for- and while-loop style
selinux: conditional expression type validation was off-by-one
smack: limit privilege by label
SELinux: Fix a potentially uninitialised variable in SELinux hooks
SELinux: trivial, remove unneeded local variable
SELinux: Trivial minor fixes that change C null character style
make selinux_write_opts() static
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 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, |