Commit bb53a761 authored by Daniel Walker's avatar Daniel Walker Committed by Linus Torvalds

[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: default avatarDaniel Walker <dwalker@mvista.com>
Acked-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 655fdeab
...@@ -140,7 +140,7 @@ extern int tpm_pm_resume(struct device *); ...@@ -140,7 +140,7 @@ extern int tpm_pm_resume(struct device *);
extern struct dentry ** tpm_bios_log_setup(char *); extern struct dentry ** tpm_bios_log_setup(char *);
extern void tpm_bios_log_teardown(struct dentry **); extern void tpm_bios_log_teardown(struct dentry **);
#else #else
static inline struct dentry* tpm_bios_log_setup(char *name) static inline struct dentry ** tpm_bios_log_setup(char *name)
{ {
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment