diff options
| author | Kylene Jo Hall <kjhall@us.ibm.com> | 2006-05-15 12:44:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-15 14:20:57 -0400 |
| commit | 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 (patch) | |
| tree | ff9daf3ca4ad802fe1c25adf40aa65d76d49b770 /drivers/char | |
| parent | 64471ebe534dc6cedd72849b2324b52cb5249eb9 (diff) | |
[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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
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 { | |||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | enum tis_defaults { | 57 | enum tis_defaults { |
| 58 | TIS_MEM_BASE = 0xFED4000, | 58 | TIS_MEM_BASE = 0xFED40000, |
| 59 | TIS_MEM_LEN = 0x5000, | 59 | TIS_MEM_LEN = 0x5000, |
| 60 | TIS_SHORT_TIMEOUT = 750, /* ms */ | 60 | TIS_SHORT_TIMEOUT = 750, /* ms */ |
| 61 | TIS_LONG_TIMEOUT = 2000, /* 2 sec */ | 61 | TIS_LONG_TIMEOUT = 2000, /* 2 sec */ |