git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
char
/
tpm
/
tpm.h
diff --git
a/drivers/char/tpm/tpm.h
b/drivers/char/tpm/tpm.h
index
72ddb03
..
d84ff77
100644
(file)
--- a/
drivers/char/tpm/tpm.h
+++ b/
drivers/char/tpm/tpm.h
@@
-56,6
+56,8
@@
extern ssize_t tpm_show_owned(struct device *, struct device_attribute *attr,
char *);
extern ssize_t tpm_show_temp_deactivated(struct device *,
struct device_attribute *attr, char *);
+extern ssize_t tpm_show_timeouts(struct device *,
+ struct device_attribute *attr, char *);
struct tpm_chip;