summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-27 11:45:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:26:07 -0700
commit3dcce8e22bf9956ac2c5233539cac07c978e58c7 (patch)
tree33de592099774c7c2d6a5cf3d9664dd88df9f985 /drivers/char
parentebb81fdb3dd0be7514b84197c4f8388a17130f04 (diff)
[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_infineon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 07542f9e7644..0e3241645c19 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -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);