aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2006-05-15 09:44:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 11:20:57 -0700
commitbb53a76116a8af13ee2581c85c02fe40e0c1a599 (patch)
tree1338b1488774d50aa8f6586c72a6e6b1400e3327
parent655fdeab809a5612b0eab6aee873b00d26404ca7 (diff)
downloadlinux-bb53a76116a8af13ee2581c85c02fe40e0c1a599.tar.gz
[PATCH] tpm_register_hardware gcc 4.1 warning fix
drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker <dwalker@mvista.com> Acked-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/tpm/tpm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 54a4c804e25..050ced247f6 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -140,7 +140,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;
}