From e89d53b9286a2845b94450a77e58274844b91964 Mon Sep 17 00:00:00 2001 From: Kylene Jo Hall Date: Mon, 15 May 2006 09:44:25 -0700 Subject: [PATCH] --- yaml --- r: 26719 b: refs/heads/master c: 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 h: refs/heads/master i: 26717: f8c0d475958f259e74e22c96fb9c3172d48266e6 26715: 59d371c50a25062ef64ad636ab14e7fe4bd22b76 26711: 71eb071054295a7392def510b13a85944b3a1764 26703: 635d11b1e4510af0b2e72609938e48c9384833ef 26687: 2d546db45c94b180f2cc162fe6630f040e6115cd v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_tis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c690d2094e0..66877f34b160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64471ebe534dc6cedd72849b2324b52cb5249eb9 +refs/heads/master: 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c index b9cae9a238bb..f621168f38ae 100644 --- a/trunk/drivers/char/tpm/tpm_tis.c +++ b/trunk/drivers/char/tpm/tpm_tis.c @@ -55,7 +55,7 @@ enum tis_int_flags { }; enum tis_defaults { - TIS_MEM_BASE = 0xFED4000, + TIS_MEM_BASE = 0xFED40000, TIS_MEM_LEN = 0x5000, TIS_SHORT_TIMEOUT = 750, /* ms */ TIS_LONG_TIMEOUT = 2000, /* 2 sec */