linux-next: build warning after merge of the tpmdd tree

[Stephen Rothwell]

Hi Jarkko,

After merging the tpmdd tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

drivers/char/tpm/tpm_i2c_nuvoton.c:45: warning: "TPM_RETRY" redefined
 #define TPM_RETRY      5
 
In file included from drivers/char/tpm/tpm_i2c_nuvoton.c:35:
drivers/char/tpm/tpm.h:43: note: this is the location of the previous definition
 #define TPM_RETRY  50
 
drivers/char/tpm/tpm_i2c_infineon.c:30: warning: "TPM_BUFSIZE" redefined
 #define TPM_BUFSIZE 1260
 
In file included from drivers/char/tpm/tpm_i2c_infineon.c:27:
drivers/char/tpm/tpm.h:41: note: this is the location of the previous definition
 #define TPM_BUFSIZE  4096
 
In file included from drivers/char/tpm/st33zp24/i2c.c:30:
drivers/char/tpm/st33zp24/st33zp24.h:22: warning: "TPM_BUFSIZE" redefined
 #define TPM_BUFSIZE                     2048
 
In file included from drivers/char/tpm/st33zp24/i2c.c:29:
drivers/char/tpm/st33zp24/../tpm.h:41: note: this is the location of the 
previous definition
 #define TPM_BUFSIZE  4096
 
In file included from drivers/char/tpm/st33zp24/spi.c:30:
drivers/char/tpm/st33zp24/st33zp24.h:22: warning: "TPM_BUFSIZE" redefined
 #define TPM_BUFSIZE                     2048
 
In file included from drivers/char/tpm/st33zp24/spi.c:29:
drivers/char/tpm/st33zp24/../tpm.h:41: note: this is the location of the 
previous definition
 #define TPM_BUFSIZE  4096
 
In file included from drivers/char/tpm/st33zp24/st33zp24.c:34:
drivers/char/tpm/st33zp24/st33zp24.h:22: warning: "TPM_BUFSIZE" redefined
 #define TPM_BUFSIZE                     2048
 
In file included from drivers/char/tpm/st33zp24/st33zp24.c:33:
drivers/char/tpm/st33zp24/../tpm.h:41: note: this is the location of the 
previous definition
 #define TPM_BUFSIZE  4096
 
In file included from drivers/char/tpm/st33zp24/st33zp24.c:34:
drivers/char/tpm/st33zp24/st33zp24.h:22: warning: "TPM_BUFSIZE" redefined
 #define TPM_BUFSIZE                     2048
 
In file included from drivers/char/tpm/st33zp24/st33zp24.c:33:
drivers/char/tpm/st33zp24/../tpm.h:41: note: this is the location of the 
previous definition
 #define TPM_BUFSIZE  4096
 

Introduced by commit

  569c1057f9ac ("tpm: move tpm_chip definition to include/linux/tpm.h")

-- 
Cheers,
Stephen Rothwell

pgpyNJPyKAYnF.pgp
Description: OpenPGP digital signature