Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[linux-2.6-omap-h63xx.git] / drivers / char / tpm / Kconfig

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index fe00c7dfb649bf054376aa30522cb6c1ed2098e7..8f3f7620f95a13afcc72b2fa36d142b1e5167303 100644 (file)
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -2,10 +2,9 @@
 # TPM device configuration
 #
 
-menu "TPM devices"
-
-config TCG_TPM
+menuconfig TCG_TPM
        tristate "TPM Hardware Support"
+       depends on HAS_IOMEM
        depends on EXPERIMENTAL
        ---help---
          If you have a TPM security chip in your system, which
@@ -20,9 +19,11 @@ config TCG_TPM
          Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
          and CONFIG_PNPACPI.
 
+if TCG_TPM
+
 config TCG_TIS
        tristate "TPM Interface Specification 1.2 Interface"
-       depends on TCG_TPM && PNPACPI
+       depends on PNPACPI
        ---help---
          If you have a TPM security chip that is compliant with the
          TCG TIS 1.2 TPM specification say Yes and it will be accessible
@@ -31,16 +32,15 @@ config TCG_TIS
 
 config TCG_NSC
        tristate "National Semiconductor TPM Interface"
-       depends on TCG_TPM && PNPACPI
+       depends on PNPACPI
        ---help---
-         If you have a TPM security chip from National Semicondutor 
+         If you have a TPM security chip from National Semiconductor 
          say Yes and it will be accessible from within Linux.  To 
          compile this driver as a module, choose M here; the module 
          will be called tpm_nsc.
 
 config TCG_ATMEL
        tristate "Atmel TPM Interface"
-       depends on TCG_TPM
        ---help---
          If you have a TPM security chip from Atmel say Yes and it 
          will be accessible from within Linux.  To compile this driver 
@@ -48,7 +48,7 @@ config TCG_ATMEL
 
 config TCG_INFINEON
        tristate "Infineon Technologies TPM Interface"
-       depends on TCG_TPM && PNPACPI
+       depends on PNPACPI
        ---help---
          If you have a TPM security chip from Infineon Technologies
          (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
@@ -58,5 +58,4 @@ config TCG_INFINEON
          Further information on this driver and the supported hardware
          can be found at http://www.prosec.rub.de/tpm
 
-endmenu
-
+endif # TCG_TPM