Showing the logo on every open became annoying. I leave it up to the driver...

Showing the logo on every open became annoying. I leave it up to the driver writers when they want to display the logo. Fo embeded devices it probably is wise to have them set there mode themselves then display the logo to let them know if the hartdware worked. FOnt header file location changed.

drivers/video/console/fonts.c

@@ -19,7 +19,7 @@
 #if defined(__mc68000__) || defined(CONFIG_APUS)
 #include <asm/setup.h>
 #endif
-#include "font.h"
+#include <linux/font.h>
 
 #define NO_FONTS
 

drivers/video/fbmem.c

@@ -360,7 +360,6 @@ static initcall_t pref_init_funcs[FB_MAX];
 static int num_pref_init_funcs __initdata = 0;
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
-static int nologo;
 
 #ifdef CONFIG_FB_OF
 static int ofonly __initdata = 0;
@@ -993,8 +992,6 @@ fb_open(struct inode *inode, struct file *file)
 		if (res)
 			module_put(info->fbops->owner);
 	}
-	if (!nologo)
-		fb_show_logo(info);
 	return res;
 }
 
@@ -1148,9 +1145,6 @@ int __init video_setup(char *options)
 	}
 #endif
 
-	if (!strcmp(options, "nologo"))
-		nologo = 1;				
-
 	if (num_pref_init_funcs == FB_MAX)
 		return 0;