diff options
| author | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
| commit | 93db628658197aa46bd7f83d429908b6f187ec9c (patch) | |
| tree | b09496f42570a5864212eb8cfde4ba2ea9fa7a40 /drivers/char/tpm/tpm.h | |
| parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
| parent | 0da939b0058742ad2d8580b7db6b966d0fc72252 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/char/tpm/tpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index e885148b4cf..8e30df4a438 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -90,7 +90,7 @@ struct tpm_chip { struct device *dev; /* Device stuff */ int dev_num; /* /dev/tpm# */ - int num_opens; /* only one allowed */ + unsigned long is_open; /* only one allowed */ int time_expired; /* Data passed to and from the tpm via the read/write calls */ @@ -132,6 +132,7 @@ extern struct tpm_chip* tpm_register_hardware(struct device *, const struct tpm_vendor_specific *); extern int tpm_open(struct inode *, struct file *); extern int tpm_release(struct inode *, struct file *); +extern void tpm_dev_vendor_release(struct tpm_chip *); extern ssize_t tpm_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); |