Hi Hans

On Mon, 3 Jun 2013, Hans Verkuil wrote:

> From: Hans Verkuil <hans.verk...@cisco.com>
> 
> The current_norm field is deprecated and is replaced by g_std. This driver
> already implements g_std, so just remove current_norm.
> 
> Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
> Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de>

Would you like to pull this via your tree? In that case

Acked-by: Guennadi Liakhovetski <g.liakhovet...@gmx.de>

Otherwise I can easily take it via mine.

Thanks
Guennadi

> ---
>  drivers/media/platform/sh_vou.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
> index 7d02350..84625fa 100644
> --- a/drivers/media/platform/sh_vou.c
> +++ b/drivers/media/platform/sh_vou.c
> @@ -1313,7 +1313,6 @@ static const struct video_device sh_vou_video_template 
> = {
>       .fops           = &sh_vou_fops,
>       .ioctl_ops      = &sh_vou_ioctl_ops,
>       .tvnorms        = V4L2_STD_525_60, /* PAL only supported in 8-bit 
> non-bt656 mode */
> -     .current_norm   = V4L2_STD_NTSC_M,
>       .vfl_dir        = VFL_DIR_TX,
>  };
>  
> @@ -1352,7 +1351,7 @@ static int sh_vou_probe(struct platform_device *pdev)
>       pix = &vou_dev->pix;
>  
>       /* Fill in defaults */
> -     vou_dev->std            = sh_vou_video_template.current_norm;
> +     vou_dev->std            = V4L2_STD_NTSC_M;
>       rect->left              = 0;
>       rect->top               = 0;
>       rect->width             = VOU_MAX_IMAGE_WIDTH;
> -- 
> 1.7.10.4
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to