From: Jason Gunthorpe Date: Thu, 3 Oct 2013 04:51:09 +0000 (-0600) Subject: tpm: Merge the tpm-bios module with tpm.o X-Git-Tag: v3.13-rc1~18^2~41 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=187eea0c353abd4ffa3a9cc86a660af9605fcb10;p=pandora-kernel.git tpm: Merge the tpm-bios module with tpm.o Now that we can have multiple .c files in the tpm module there is no reason for tpm-bios. tpm-bios exported several functions: tpm_bios_log_setup, tpm_bios_log_teardown, tpm_add_ppi, and tpm_remove_ppi. They are only used by tpm, and if tpm-bios is built then tpm will unconditionally require them. Further, tpm-bios does nothing on its own, it has no module_init function. Thus we remove the exports and merge the modules to simplify things. The Makefile conditions are changed slightly to match the code, tpm_ppi is always required if CONFIG_ACPI is set. Signed-off-by: Jason Gunthorpe --- Reading git-diff-tree failed