aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.h
diff options
context:
space:
mode:
authorKylene Hall <kjhall@us.ibm.com>2005-06-24 01:01:56 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:05:25 -0400
commitfe3fd48384af79e7619d3c6b0a020f801ef63c3b (patch)
tree1caf9ce5470e3a18b70547d9bb046ee379faebff /drivers/char/tpm/tpm.h
parent2df7111fc6b0e050b06123379821ece2f8dd5bbc (diff)
[PATCH] tpm: fix timer initialization
Fix the timer to be inited and modified properly. This work depends on the fixing of the msleep stuff which in patch 1 of this set. Signed-of-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/tpm/tpm.h')
-rw-r--r--drivers/char/tpm/tpm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 1a94a8c345e0..3a5af7e06624 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -63,8 +63,6 @@ struct tpm_chip {
63 63
64 struct timer_list user_read_timer; /* user needs to claim result */ 64 struct timer_list user_read_timer; /* user needs to claim result */
65 struct semaphore tpm_mutex; /* tpm is processing */ 65 struct semaphore tpm_mutex; /* tpm is processing */
66 struct timer_list device_timer; /* tpm is processing */
67 struct semaphore timer_manipulation_mutex;
68 66
69 struct tpm_vendor_specific *vendor; 67 struct tpm_vendor_specific *vendor;
70 68