tree 33de592099774c7c2d6a5cf3d9664dd88df9f985
parent ebb81fdb3dd0be7514b84197c4f8388a17130f04
author Andrew Morton <[EMAIL PROTECTED]> Thu, 28 Jul 2005 01:45:14 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Thu, 28 Jul 2005 06:26:07 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/char/tpm/tpm_infineon.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
--- 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(struc
}
/* activate register */
- outb(DAR, TPM_ADDR);
+ outb(TPM_DAR, TPM_ADDR);
outb(0x01, TPM_DATA);
outb(DISABLE_REGISTER_PAIR, TPM_ADDR);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
