diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 12:36:40 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 16:34:29 +0400 |
| commit | 5d40810812af73c812613638140c75d351422d9d (patch) | |
| tree | b986047f7da759e309547eb198c31ff890d63467 /drivers/media/platform/sh_vou.c | |
| parent | d31e545b00057516eac84ff0e2675bf802c2a522 (diff) | |
| download | linux-5d40810812af73c812613638140c75d351422d9d.tar.xz | |
[media] sh_vou: remove current_norm
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.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/sh_vou.c')
| -rw-r--r-- | drivers/media/platform/sh_vou.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index fa8ae7241521..7a9c5e9329f2 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c @@ -1282,7 +1282,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, }; @@ -1321,7 +1320,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; |