summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-05-15 09:44:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 11:20:57 -0700
commit2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 (patch)
treeff9daf3ca4ad802fe1c25adf40aa65d76d49b770
parent64471ebe534dc6cedd72849b2324b52cb5249eb9 (diff)
downloadlinux-stable-2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54.tar.gz
linux-stable-2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54.tar.bz2
linux-stable-2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54.zip
[PATCH] tpm: fix constant
Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/tpm/tpm_tis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index b9cae9a238bb..f621168f38ae 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/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 */