luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] ppc64: tpm_infineon build fix

Browse Source 
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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2005-07-27 11:45:14 -07:00 committed by Linus Torvalds
parent ebb81fdb3d
commit 3dcce8e22b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/tpm/tpm_infineon.c
View File

@ -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);