On Fri, 13 Jul 2007, Antonino A. Daplas wrote:
> On Fri, 2007-07-13 at 08:56 +0200, Geert Uytterhoeven wrote:
> > On Fri, 13 Jul 2007, Antonino A. Daplas wrote:
> > > On Tue, 2007-07-10 at 14:27 +0200, Geert Uytterhoeven wrote:
> > > > --- a/drivers/video/fbmem.c
> > > > +++ b/drivers/video/fbmem.c
> > > > @@ -318,6 +318,13 @@ static struct logo_data {
> > > > const struct linux_logo *logo;
> > > > } fb_logo __read_mostly;
> > > >
> > > > +#define FB_LOGO_EX_NUM_MAX 10
> > > > +static struct logo_data_extra {
> > > > + const struct linux_logo *logo;
> > > > + unsigned int n;
> > > > +} fb_logo_ex[FB_LOGO_EX_NUM_MAX];
> > > > +static unsigned int fb_logo_ex_num;
> > > > +
> > > > static void fb_rotate_logo_ud(const u8 *in, u8 *out, u32 width, u32
> > > > height)
> > > > {
> > > > u32 size = width * height, i;
> > > > @@ -411,10 +418,22 @@ static void fb_do_show_logo(struct fb_in
> > > > }
> > > > }
> > > >
> > > > +#ifdef CONFIG_FB
> > >
> > > The #ifdef is redundant.
> >
> > IIRC, it's needed for the CONFIG_FB=m case.
>
> What would happen if CONFIG_FB=m? (We already have a patch that prevents
> logo drawing if the driver or fbcon is modular)
Then we use the dummy fb_append_extra_logo() in <linux/linux_logo.h>.
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: [EMAIL PROTECTED]
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
