From: Andrew Morton <akpm@linux-foundation.org>

- Make nologo static

- Fix checkpatch warning

Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN drivers/video/console/newport_con.c~fbcon-logo-disable-logo-at-boot-fix drivers/video/console/newport_con.c
--- a/drivers/video/console/newport_con.c~fbcon-logo-disable-logo-at-boot-fix
+++ a/drivers/video/console/newport_con.c
@@ -98,7 +98,7 @@ static inline void newport_init_cmap(voi
 	}
 }
 
-static struct linux_logo * newport_show_logo(void)
+static struct linux_logo *newport_show_logo(void)
 {
 #ifdef CONFIG_LOGO_SGI_CLUT224
 	const struct linux_logo *logo = fb_find_logo(8);
diff -puN drivers/video/logo/logo.c~fbcon-logo-disable-logo-at-boot-fix drivers/video/logo/logo.c
--- a/drivers/video/logo/logo.c~fbcon-logo-disable-logo-at-boot-fix
+++ a/drivers/video/logo/logo.c
@@ -34,7 +34,7 @@ extern const struct linux_logo logo_supe
 extern const struct linux_logo logo_superh_clut224;
 extern const struct linux_logo logo_m32r_clut224;
 
-int nologo;
+static int nologo;
 module_param(nologo, bool, 0);
 MODULE_PARM_DESC(nologo, "Disables startup logo");
 
_