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

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

diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index c137d6afe4840cea10fd7a6b8fb6ad839ca7007b..98afd385c49cda8491d012979382c41c7229a61d 100644 (file)
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -1719,15 +1719,6 @@ static int au1200fb_drv_probe(struct platform_device *dev)
                }
 
                au1200fb_fb_set_par(fbi);
-
-#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
-               if (plane == 0)
-                       if (fb_prepare_logo(fbi, FB_ROTATE_UR)) {
-                               /* Start display and show logo on boot */
-                               fb_set_cmap(&fbi->cmap, fbi);
-                               fb_show_logo(fbi, FB_ROTATE_UR);
-                       }
-#endif
        }
 
        /* Now hook interrupt too */