diff options
| author | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
| commit | 9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch) | |
| tree | 2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /drivers/char | |
| parent | 2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff) | |
| parent | 4c2c392763a682354fac65b6a569adec4e4b5387 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 7fc75e47e6d0..a048199ce866 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | menuconfig TCG_TPM | 5 | 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 | ||
| 9 | select SECURITYFS | 8 | select SECURITYFS |
| 10 | ---help--- | 9 | ---help--- |
| 11 | If you have a TPM security chip in your system, which | 10 | If you have a TPM security chip in your system, which |