]> git.karo-electronics.de Git - linux-beck.git/commit
tpm: Merge the tpm-bios module with tpm.o
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Thu, 3 Oct 2013 04:51:09 +0000 (22:51 -0600)
committerPeter Huewe <peterhuewe@gmx.de>
Tue, 22 Oct 2013 17:43:01 +0000 (19:43 +0200)
commit187eea0c353abd4ffa3a9cc86a660af9605fcb10
tree056d3de6e71f68ef6aeb5bb2d024fac3af5ff5da
parent9deb0eb7cad450cd942a0eca11a198f6d24cb3d4
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 <jgunthorpe@obsidianresearch.com>
drivers/char/tpm/Makefile
drivers/char/tpm/tpm_eventlog.c
drivers/char/tpm/tpm_ppi.c