summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/Makefile
diff options
context:
space:
mode:
authorXiaoyan Zhang <xiaoyan.zhang@intel.com>2012-08-22 12:47:22 +0200
committerKent Yoder <key@linux.vnet.ibm.com>2012-08-22 23:23:42 +0200
commitf84fdff0fdcda7e509ce530e0ee612233a2104fb (patch)
tree6af900776de08b9610f383eb741681366e800e9a /drivers/char/tpm/Makefile
parentDocumentation: sysfs for Physical Presence Interface (diff)
downloadlinux-f84fdff0fdcda7e509ce530e0ee612233a2104fb.tar.xz
linux-f84fdff0fdcda7e509ce530e0ee612233a2104fb.zip
driver: add PPI support in tpm driver
The Physical Presence Interface enables the OS and the BIOS to cooperate and provides a simple and straightforward platform user experience for administering the TPM without sacrificing security. V2: separate the patch out in a separate source file, add #ifdef CONFIG_ACPI so it compiles out on ppc, use standard error instead of ACPI error as return code of show/store fns. V3: move #ifdef CONFIG_ACPI from .c file to .h file. V4: move tpm_ppi code from tpm module to tpm_bios module. V5: modify sys_add_ppi() so that ppi_attr_grp doesn't need to be exported Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang@intel.com> Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm/Makefile')
-rw-r--r--drivers/char/tpm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 9080cc44e3c4..5b3fc8bc6c13 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_TCG_TPM) += tpm.o
ifdef CONFIG_ACPI
obj-$(CONFIG_TCG_TPM) += tpm_bios.o
- tpm_bios-objs += tpm_eventlog.o tpm_acpi.o
+ tpm_bios-objs += tpm_eventlog.o tpm_acpi.o tpm_ppi.o
else
ifdef CONFIG_TCG_IBMVTPM
obj-$(CONFIG_TCG_TPM) += tpm_bios.o