Jesse Keating 2f82dd
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
Jesse Keating 2f82dd
index 1657b96..4c5c2be 100644
Jesse Keating 2f82dd
--- a/drivers/video/console/fbcon.c
Jesse Keating 2f82dd
+++ b/drivers/video/console/fbcon.c
Jesse Keating 2f82dd
@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
Jesse Keating 2f82dd
 		kfree(save);
Jesse Keating 2f82dd
 	}
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-	if (logo_lines > vc->vc_bottom) {
Jesse Keating 2f82dd
-		logo_shown = FBCON_LOGO_CANSHOW;
Jesse Keating 2f82dd
-		printk(KERN_INFO
Jesse Keating 2f82dd
-		       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
Jesse Keating 2f82dd
-	} else if (logo_shown != FBCON_LOGO_DONTSHOW) {
Jesse Keating 2f82dd
-		logo_shown = FBCON_LOGO_DRAW;
Jesse Keating 2f82dd
-		vc->vc_top = logo_lines;
Jesse Keating 2f82dd
+	if (logo_shown != FBCON_LOGO_DONTSHOW) {
Jesse Keating 2f82dd
+		if (logo_lines > vc->vc_bottom) {
Jesse Keating 2f82dd
+			logo_shown = FBCON_LOGO_CANSHOW;
Jesse Keating 2f82dd
+			printk(KERN_INFO
Jesse Keating 2f82dd
+			       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
Jesse Keating 2f82dd
+		} else {
Jesse Keating 2f82dd
+			logo_shown = FBCON_LOGO_DRAW;
Jesse Keating 2f82dd
+			vc->vc_top = logo_lines;
Jesse Keating 2f82dd
+		}
Jesse Keating 2f82dd
 	}
Jesse Keating 2f82dd
 }
Jesse Keating 2f82dd
 #endif /* MODULE */
Jesse Keating 2f82dd
@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
Jesse Keating 2f82dd
 	return 0;
Jesse Keating 2f82dd
 }
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
+static int __init quiet_logo(char *str)
Jesse Keating 2f82dd
+{
Jesse Keating 2f82dd
+	logo_shown = FBCON_LOGO_DONTSHOW;
Jesse Keating 2f82dd
+	return 0;
Jesse Keating 2f82dd
+}
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
+early_param("quiet", quiet_logo);
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
 module_init(fb_console_init);
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 #ifdef MODULE