diff --git a/[refs] b/[refs]
index 3d6a047c1dcf..9b64d1425a7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebb81fdb3dd0be7514b84197c4f8388a17130f04
+refs/heads/master: 3dcce8e22bf9956ac2c5233539cac07c978e58c7
diff --git a/trunk/drivers/char/tpm/tpm_infineon.c b/trunk/drivers/char/tpm/tpm_infineon.c
index 07542f9e7644..0e3241645c19 100644
--- a/trunk/drivers/char/tpm/tpm_infineon.c
+++ b/trunk/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);