summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/Kconfig
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-07 01:19:29 +0200
committerJames Morris <jmorris@namei.org>2010-05-07 01:19:29 +0200
commitec4a162af388a2716c5314c4aff7029071d09f57 (patch)
tree10b5c972f756620c8bba693a4363029c42d37ef3 /drivers/char/tpm/Kconfig
parentKEYS: Do preallocation for __key_link() (diff)
downloadlinux-ec4a162af388a2716c5314c4aff7029071d09f57.tar.xz
linux-ec4a162af388a2716c5314c4aff7029071d09f57.zip
Revert "TPM: ACPI/PNP dependency removal"
This reverts commit b89e66e1e396f7b5436af154e58209320cc08aed. > > When CONFIG_PM is not set: > > > > drivers/built-in.o: In function `acpi_init': > > bus.c:(.init.text+0x2d84): undefined reference to `pm_flags' > > bus.c:(.init.text+0x2d91): undefined reference to `pm_flags' > > CONFIG_ACPI depends on CONFIG_PM, > so acpi/bus.c should not be compiled for CONFIG_PM=n > > Hmm, is is somebody doing something strange, like "select ACPI" > without guaranteeing that all of ACPI's dependencies are satisfied? Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char/tpm/Kconfig')
-rw-r--r--drivers/char/tpm/Kconfig14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index bfc2c26780fb..f5fc64f89c5c 100644
--- 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---