Skip to content

Commit faaca0a

Browse files
author
Jarkko Sakkinen
committed
tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break user space scripts. This can be achieved by renaming tpm_tis_spi.c as tpm_tis_spi_main.c. Then tpm_tis_spi-y can be used inside the makefile. Cc: Andrey Pronin <[email protected]> Cc: Stephen Boyd <[email protected]> Cc: [email protected] # 5.5.x Fixes: 797c011 ("tpm: tpm_tis_spi: Support cr50 devices") Reported-by: Alexander Steffen <[email protected]> Tested-by: Alexander Steffen <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]>
1 parent 11a48a5 commit faaca0a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

drivers/char/tpm/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o
2121
tpm-$(CONFIG_OF) += eventlog/of.o
2222
obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
2323
obj-$(CONFIG_TCG_TIS) += tpm_tis.o
24-
obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi_mod.o
25-
tpm_tis_spi_mod-y := tpm_tis_spi.o
26-
tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
24+
25+
obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
26+
tpm_tis_spi-y := tpm_tis_spi_main.o
27+
tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
28+
2729
obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
2830
obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
2931
obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
File renamed without changes.

0 commit comments

Comments
 (0)