Revert "TPM: ACPI/PNP dependency removal"

[safe/jmp/linux-2.6] / drivers / char / tpm / Kconfig

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index bfc2c26..f5fc64f 100644 (file)
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -17,28 +17,20 @@ menuconfig TCG_TPM
          obtained at: <http://sourceforge.net/projects/trousers>.  To 
          compile this driver as a module, choose M here; the module 
          will be called tpm. If unsure, say N.
-         Note: For more TPM drivers and BIOS LOG access enable
-         CONFIG_PNP, CONFIG_ACPI and CONFIG_PNPACPI.
+         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 PNP
        ---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
          from within Linux.  To compile this driver as a module, choose
          M here; the module will be called tpm_tis.
 
-config TCG_BIOS_LOG
-       bool "TPM bios mesurement log"
-       depends on X86
-       select ACPI
-       ---help---
-         ACPI is required for access to bios measurements lists and therefore
-         to validate the PCR[0] value. So say Yes in case you want this
-         feature and, consequently, ACPI will be enabled.
-
 config TCG_NSC
        tristate "National Semiconductor TPM Interface"
        ---help---