VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / video / logo / logo.c

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 3ac34c1..0ba8d34 100644 (file)
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -11,12 +11,13 @@
 
 #include <linux/config.h>
 #include <linux/linux_logo.h>
+#include <linux/stddef.h>
 
 #ifdef CONFIG_M68K
 #include <asm/setup.h>
 #endif
 
-#if defined(CONFIG_MIPS) || defined(CONFIG_MIPS64)
+#ifdef CONFIG_MIPS
 #include <asm/bootinfo.h>
 #endif
 
@@ -35,7 +36,7 @@ extern const struct linux_logo logo_superh_clut224;
 
 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