| Message ID | 1589203346-3857-1-git-send-email-johannes.holland@infineon.com |
|---|---|
| State | Accepted |
| Commit | bedbb383e1bf5777386c885950f7fb0a21b0daa2 |
| Headers | show |
| Series | [1/2] tpm: add #ifndef to fix redeclaration build errors | expand |
diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h index 947585f8e3..2a160fe05c 100644 --- a/drivers/tpm/tpm_tis.h +++ b/drivers/tpm/tpm_tis.h @@ -104,6 +104,7 @@ struct tpm_cmd_t { /* Max number of iterations after i2c NAK */ #define MAX_COUNT 3 +#ifndef __TPM_V2_H /* * Max number of iterations after i2c NAK for 'long' commands * @@ -127,5 +128,6 @@ enum tis_status { TPM_STS_DATA_AVAIL = 0x10, TPM_STS_DATA_EXPECT = 0x08, }; +#endif #endif
tpm_tis_spi.c directly includes tpm_tis.h and tpm-v2.h which both define the same enums (see e.g. TPM_ACCESS_VALID). Add an #ifndef to prevent redeclaration errors. Signed-off-by: Johannes Holland <johannes.holland at infineon.com> --- drivers/tpm/tpm_tis.h | 2 ++ 1 file changed, 2 insertions(+)