Merge branch 'master' into 83xx

[linux-2.6] / drivers / char / tpm / tpm.h

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 24541a556d027cca8bf278caccc31af05be52dd5..bb9a43c6cf3db88e2a74f4892ea6f2d048f0450e 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -77,8 +78,8 @@ struct tpm_vendor_specific {
        struct attribute_group *attr_group;
        struct list_head list;
        int locality;
-       u32 timeout_a, timeout_b, timeout_c, timeout_d;
-       u32 duration[3];
+       unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
+       unsigned long duration[3]; /* jiffies */
 
        wait_queue_head_t read_queue;
        wait_queue_head_t int_queue;
@@ -140,7 +141,7 @@ extern int tpm_pm_resume(struct device *);
 extern struct dentry ** tpm_bios_log_setup(char *);
 extern void tpm_bios_log_teardown(struct dentry **);
 #else
-static inline struct dentry* tpm_bios_log_setup(char *name)
+static inline struct dentry ** tpm_bios_log_setup(char *name)
 {
        return NULL;
 }