[Cbe-oss-dev] fbdev: make fb_append_extra_logo() depend on fb=y

[Geert Uytterhoeven]

On Wed, 18 Jul 2007, Arnd Bergmann wrote:
> We can't show the extra logo from boot code if FB is built as
> a module. Make the FB_LOGO_EXTRA depend on FB=y.

Bummer...

> Signed-off-by: Arnd Bergmann <arnd at arndb.de>

Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>

> Reported by Al Viro. I don't know how this ended up in the final
> patch, as I'm pretty sure we talked about this scenario before
> and had a solution...

It happened because introducing CONFIG_FB_LOGO_EXTRA was done in the last
iteration (before the code was protected by #ifdef CONFIG_FB), and I got
bitten by the weird Kconfig logic again.

> diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
> index da219c0..9de1c11 100644
> --- a/drivers/video/logo/Kconfig
> +++ b/drivers/video/logo/Kconfig
> @@ -12,7 +12,7 @@ if LOGO
>  
>  config FB_LOGO_EXTRA
>  	bool
> -	depends on FB
> +	depends on FB=y
>  	default y if SPU_BASE
>  
>  config LOGO_LINUX_MONO

With kind regards,
 
Geert Uytterhoeven
Software Architect

Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
 
Phone:    +32 (0)2 700 8453	
Fax:      +32 (0)2 700 8622	
E-mail:   Geert.Uytterhoeven at sonycom.com	
Internet: http://www.sony-europe.com/
 	
Sony Network and Software Technology Center Europe	
A division of Sony Service Centre (Europe) N.V.	
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium	
VAT BE 0413.825.160 · RPR Brussels	
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619