This is preparation for making the tpm module multi-file. kbuild does not like having a .c file with the same name as a module. We wish to keep the tpm module name so that userspace doesn't see this change.
tpm-interface.c is chosen because the next several commits in the series migrate items into tpm-sysfs.c, tpm-dev.c and tpm-class.c. All that will be left is tpm command processing and interfacing code. Signed-off-by: Jason Gunthorpe <[email protected]> --- drivers/char/tpm/Makefile | 2 ++ drivers/char/tpm/{tpm.c => tpm-interface.c} | 0 2 files changed, 2 insertions(+) rename drivers/char/tpm/{tpm.c => tpm-interface.c} (100%) This patch fits into the earlier posted series, see: https://github.com/jgunthorpe/linux/commits/for-tpm diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index eb41ff9..83b8a9d 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -2,6 +2,8 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o +tpm-y := tpm-interface.o + ifdef CONFIG_ACPI obj-$(CONFIG_TCG_TPM) += tpm_bios.o tpm_bios-objs += tpm_eventlog.o tpm_acpi.o tpm_ppi.o diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm-interface.c similarity index 100% rename from drivers/char/tpm/tpm.c rename to drivers/char/tpm/tpm-interface.c -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

