summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2012-02-09 17:02:34 +1100
committerJames Morris <jmorris@namei.org>2012-02-09 17:02:34 +1100
commit9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch)
tree2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /drivers
parent2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff)
parent4c2c392763a682354fac65b6a569adec4e4b5387 (diff)
downloadlinux-3.10-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.tar.gz
linux-3.10-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.tar.bz2
linux-3.10-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.zip
Merge branch 'next-queue' into next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 7fc75e47e6d..a048199ce86 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -5,7 +5,6 @@
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