[PATCH] video/logo: CONFIG_LOGO conflicts with FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER

When FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is enabled, logo are not being displayed --- drivers/video/logo/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 6d6f8c08792d..fe07dfb59d3d 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -5,9 +5,10 @@

menuconfig LOGO bool "Bootup logo" - depends on FB || SGI_NEWPORT_CONSOLE + depends on (FB && !FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER) || SGI_NEWPORT_CONSOLE help - Enable and select frame buffer bootup logos. + Enable and select frame buffer bootup logos. Note no logo will be + displayed if FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is enabled

if LOGO