Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/video/logo
Modified Files:
logo.c
Log Message:
Merge with 2.6.8
Index: logo.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/logo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logo.c 28 Jul 2004 22:49:19 -0000 1.3
+++ logo.c 2 Sep 2004 19:51:19 -0000 1.4
@@ -11,6 +11,7 @@
#include <linux/config.h>
#include <linux/linux_logo.h>
+#include <linux/stddef.h>
#ifdef CONFIG_M68K
#include <asm/setup.h>
@@ -35,7 +36,7 @@
const struct linux_logo *fb_find_logo(int depth)
{
- const struct linux_logo *logo = 0;
+ const struct linux_logo *logo = NULL;
if (depth >= 1) {
#ifdef CONFIG_LOGO_LINUX_MONO
|
