* [PATCH -mm] tpm_register_hardware gcc 4.1 warning fix
@ 2006-05-10 2:56 Daniel Walker
2006-05-10 17:08 ` Kylene Jo Hall
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Walker @ 2006-05-10 2:56 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel
Fixes the following warning,
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>
Index: linux-2.6.16/drivers/char/tpm/tpm.h
===================================================================
--- linux-2.6.16.orig/drivers/char/tpm/tpm.h
+++ linux-2.6.16/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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -mm] tpm_register_hardware gcc 4.1 warning fix
2006-05-10 2:56 [PATCH -mm] tpm_register_hardware gcc 4.1 warning fix Daniel Walker
@ 2006-05-10 17:08 ` Kylene Jo Hall
0 siblings, 0 replies; 2+ messages in thread
From: Kylene Jo Hall @ 2006-05-10 17:08 UTC (permalink / raw)
To: Daniel Walker; +Cc: akpm, linux-kernel
Ack'ed by: Kylene Hall <kjhall@us.ibm.com>
On Tue, 2006-05-09 at 19:56 -0700, Daniel Walker wrote:
> Fixes the following warning,
>
> 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>
>
> Index: linux-2.6.16/drivers/char/tpm/tpm.h
> ===================================================================
> --- linux-2.6.16.orig/drivers/char/tpm/tpm.h
> +++ linux-2.6.16/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;
> }
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-10 17:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-05-10 2:56 [PATCH -mm] tpm_register_hardware gcc 4.1 warning fix Daniel Walker
2006-05-10 17:08 ` Kylene Jo Hall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).