Merge tag 'drm-misc-next-2023-09-27' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / video / fbdev / core / fbcon.c

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index f157a5a1dffcf3a898eb9f447167e8fa245c98ce..63af6ab034b5f1bb45992a4074f8862d528b38d3 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -472,6 +472,7 @@ static int __init fb_console_setup(char *this_opt)
                }
 #endif
 
+#ifdef CONFIG_LOGO
                if (!strncmp(options, "logo-pos:", 9)) {
                        options += 9;
                        if (!strcmp(options, "center"))
@@ -485,6 +486,7 @@ static int __init fb_console_setup(char *this_opt)
                                fb_logo_count = simple_strtol(options, &options, 0);
                        continue;
                }
+#endif
        }
        return 1;
 }