diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 16:40:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 16:40:36 +0100 |
| commit | 78240e37963ac6f4483f6473c786c0f0ab7e78fe (patch) | |
| tree | dbb1a62ec2efe4bd14ce2a7f2d8abe76b812ccb3 /drivers/char/tpm/tpm.h | |
| parent | ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100 (diff) | |
| parent | ARM: pxa/tosa: register wm9712 codec device (diff) | |
| download | linux-78240e37963ac6f4483f6473c786c0f0ab7e78fe.tar.xz linux-78240e37963ac6f4483f6473c786c0f0ab7e78fe.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/char/tpm/tpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index d84ff772c26f..72ddb031b69a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -56,8 +56,6 @@ 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; |