Re: [PATCH] fbdev: matroxfb: Fix compilation after fb_var_screeninfochange

[Florian Tobias Schandinat]

On 12/20/2011 07:00 PM, Laurent Pinchart wrote:
> Commit fb21c2f42879 ("fbdev: Add FOURCC-based format configuration API")
> modified the layout of the fb_var_screeninfo structure. Remove zero
> fields from the static initializers in the matroxfb driver accordingly.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>

Applied.


Thanks,

Florian Tobias Schandinat

> ---
>  drivers/video/matrox/matroxfb_base.c  |    1 -
>  drivers/video/matrox/matroxfb_crtc2.c |    1 -
>  2 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
> index 44bf8d4..401a56e 100644
> --- a/drivers/video/matrox/matroxfb_base.c
> +++ b/drivers/video/matrox/matroxfb_base.c
> @@ -147,7 +147,6 @@ static struct fb_var_screeninfo vesafb_defined = {
>  	39721L,48L,16L,33L,10L,
>  	96L,2L,~0,	/* No sync info */
>  	FB_VMODE_NONINTERLACED,
> -	0, {0,0,0,0,0}
>  };
>  
>  
> diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
> index d7112c3..02796a4 100644
> --- a/drivers/video/matrox/matroxfb_crtc2.c
> +++ b/drivers/video/matrox/matroxfb_crtc2.c
> @@ -593,7 +593,6 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
>  		39721L,48L,16L,33L,10L,
>  		96L,2,0,	/* no sync info */
>  		FB_VMODE_NONINTERLACED,
> -		0, {0,0,0,0,0}
>  };
>  
>  static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/