Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / common / splash.c

diff --git a/common/splash.c b/common/splash.c
index 0bcedbb0bad9804e957916c6825c56f344504741..e7d847726d0bb1d5df9470be3f48ba22c86ee6d4 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -144,8 +144,6 @@ void splash_display_banner(void)
        vidconsole_put_string(dev, buf);
        vidconsole_position_cursor(dev, 0, row);
 }
-#else
-static inline void splash_display_banner(void) { }
 #endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
 
 /*
@@ -177,7 +175,9 @@ int splash_display(void)
        if (x || y)
                goto end;
 
+#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
        splash_display_banner();
+#endif
 end:
        return ret;
 }