aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/tpm/Makefile4
-rw-r--r--drivers/char/tpm/tpm_eventlog_acpi.c (renamed from drivers/char/tpm/tpm_acpi.c)0
-rw-r--r--drivers/char/tpm/tpm_eventlog_of.c (renamed from drivers/char/tpm/tpm_of.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 34b4bcf46f43..bce9e1402e87 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -6,8 +6,8 @@ obj-$(CONFIG_TCG_TPM) += tpm.o
6tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ 6tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \
7 tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ 7 tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \
8 tpm2-space.o 8 tpm2-space.o
9tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_acpi.o 9tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o
10tpm-$(CONFIG_OF) += tpm_of.o 10tpm-$(CONFIG_OF) += tpm_eventlog_of.o
11obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o 11obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
12obj-$(CONFIG_TCG_TIS) += tpm_tis.o 12obj-$(CONFIG_TCG_TIS) += tpm_tis.o
13obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o 13obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_eventlog_acpi.c
index acc990ba376a..acc990ba376a 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_eventlog_acpi.c
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_eventlog_of.c
index 4a2f8c79231e..4a2f8c79231e 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_eventlog_of.c