diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-18 17:26:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:42:57 -0300 |
| commit | 107063c6156a0cbf055e771baafc28a3e3c0fb9b (patch) | |
| tree | 813a2dc2c1426521167f2f289d7a106aaf2f24ec /drivers/media/video/zoran/zoran.h | |
| parent | 84c1b09495ea366276726b0df2dcd7898cda9d0f (diff) | |
| download | kernel_samsung_smdk4412-107063c6156a0cbf055e771baafc28a3e3c0fb9b.zip kernel_samsung_smdk4412-107063c6156a0cbf055e771baafc28a3e3c0fb9b.tar.gz kernel_samsung_smdk4412-107063c6156a0cbf055e771baafc28a3e3c0fb9b.tar.bz2 | |
V4L/DVB (10714): zoran et al: convert zoran i2c modules to V4L2.
The zoran i2c modules were still using V4L1 internally. Replace this
with V4L2. Also deleted saa7111.c and saa7114.c, we use saa7115.c instead.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
[mchehab@redhat.com: fix v4l2_ctrl_query_fill_std merge conflict]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran/zoran.h')
| -rw-r--r-- | drivers/media/video/zoran/zoran.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index 76668bd..ee31bfc 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h @@ -352,7 +352,7 @@ struct card_info { char name[32]; } input[BUZ_MAX_INPUT]; - int norms; + v4l2_std_id norms; struct tvnorm *tvn[3]; /* supported TV norms */ u32 jpeg_int; /* JPEG interrupt */ @@ -401,8 +401,8 @@ struct zoran { spinlock_t spinlock; /* Spinlock */ /* Video for Linux parameters */ - int input, norm; /* card's norm and input - norm=VIDEO_MODE_* */ - int hue, saturation, contrast, brightness; /* Current picture params */ + int input; /* card's norm and input - norm=VIDEO_MODE_* */ + v4l2_std_id norm; struct video_buffer buffer; /* Current buffer params */ struct zoran_overlay_settings overlay_settings; u32 *overlay_mask; /* overlay mask */ |