diff options
author | Roland Dreier | 2005-07-28 04:12:56 +0200 |
---|---|---|
committer | Roland Dreier | 2005-07-28 04:12:56 +0200 |
commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/char/tpm/Makefile | |
parent | [IB/mthca]: Use io_remap_pfn_range for PCI space (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.gz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.xz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.zip |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/char/tpm/Makefile')
-rw-r--r-- | drivers/char/tpm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 736d3df266f5..2392e404e8d1 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_TCG_TPM) += tpm.o obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o - +obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o |