diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /drivers/char/tpm/Makefile | |
parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/char/tpm/Makefile')
-rw-r--r-- | drivers/char/tpm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index ba4582d160fd..ea3a1e02a824 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_TCG_TPM) += tpm.o ifdef CONFIG_ACPI obj-$(CONFIG_TCG_TPM) += tpm_bios.o endif +obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o |