linux-fedora/linux-2.6-silence-fbcon-logo.patch

   1 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
   2 index 1657b96..4c5c2be 100644
   3 --- a/drivers/video/console/fbcon.c
   4 +++ b/drivers/video/console/fbcon.c
   5 @@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
   6                 kfree(save);
   7         }
   8
   9 -       if (logo_lines > vc->vc_bottom) {
  10 -               logo_shown = FBCON_LOGO_CANSHOW;
  11 -               printk(KERN_INFO
  12 -                      "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
  13 -       } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
  14 -               logo_shown = FBCON_LOGO_DRAW;
  15 -               vc->vc_top = logo_lines;
  16 +       if (logo_shown != FBCON_LOGO_DONTSHOW) {
  17 +               if (logo_lines > vc->vc_bottom) {
  18 +                       logo_shown = FBCON_LOGO_CANSHOW;
  19 +                       printk(KERN_INFO
  20 +                              "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
  21 +               } else {
  22 +                       logo_shown = FBCON_LOGO_DRAW;
  23 +                       vc->vc_top = logo_lines;
  24 +               }
  25         }
  26  }
  27  #endif /* MODULE */
  28 @@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
  29         return 0;
  30  }
  31
  32 +static int __init quiet_logo(char *str)
  33 +{
  34 +       logo_shown = FBCON_LOGO_DONTSHOW;
  35 +       return 0;
  36 +}
  37 +
  38 +early_param("quiet", quiet_logo);
  39 +
  40  module_init(fb_console_init);
  41
  42  #ifdef MODULE