diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 06:36:08 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 06:36:08 +0200 |
| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
| tree | addbc37a278a126a19e03edd8270e577c75a8829 /drivers/char/tpm/Kconfig | |
| parent | Merge branch 'max-sect' into upstream (diff) | |
| parent | [PATCH] libata-core: fix current kernel-doc warnings (diff) | |
| download | linux-3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb.tar.xz linux-3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb.zip | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'drivers/char/tpm/Kconfig')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 1efde3b27619..fe00c7dfb649 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -22,7 +22,7 @@ config TCG_TPM config TCG_TIS tristate "TPM Interface Specification 1.2 Interface" - depends on TCG_TPM + depends on TCG_TPM && 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 |