Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dcce8e2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] ppc64: tpm_infineon build fix 



ppc64 uses symbol `DAR', as does the TPM driver, causing a build failure.
Change the TPM name.

Cc: Marcel Selhorst <selhorst@crypto.rub.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ebb81fdb

drivers/char/tpm/tpm_infineon.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ enum infineon_tpm_status_bits { 
enum infineon_tpm_values {

	CHIP_ID1 = 0x20,

	CHIP_ID2 = 0x21,

	DAR = 0x30,

	TPM_DAR = 0x30,

	RESET_LP_IRQC_DISABLE = 0x41,

	ENABLE_REGISTER_PAIR = 0x55,

	IOLIMH = 0x60,
@@ -390,7 +390,7 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev, 
		}



		/* activate register */

		outb(DAR, TPM_ADDR);

		outb(TPM_DAR, TPM_ADDR);

		outb(0x01, TPM_DATA);

		outb(DISABLE_REGISTER_PAIR, TPM_ADDR);