diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-19 06:00:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:17 -0200 |
| commit | 873ecd8f8f5eed877df74e54e7c20aee9ef887e5 (patch) | |
| tree | 8ed37879cf4d8e28ae6df8b59b852febf6acf658 /drivers/media/video/cpia2/cpia2.h | |
| parent | 401e5f8d38f539765cf550fa76b684d10975840c (diff) | |
| download | kernel_samsung_smdk4412-873ecd8f8f5eed877df74e54e7c20aee9ef887e5.tar.gz kernel_samsung_smdk4412-873ecd8f8f5eed877df74e54e7c20aee9ef887e5.tar.bz2 kernel_samsung_smdk4412-873ecd8f8f5eed877df74e54e7c20aee9ef887e5.zip | |
V4L/DVB: cpia2: remove V4L1 support from this driver
V4L1 is deprecated and will be removed completely soon.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cpia2/cpia2.h')
| -rw-r--r-- | drivers/media/video/cpia2/cpia2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index 8d2dfc12882..916c13d5cf7 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h @@ -32,7 +32,7 @@ #define __CPIA2_H__ #include <linux/version.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/poll.h> @@ -43,7 +43,7 @@ /* define for verbose debug output */ //#define _CPIA2_DEBUG_ -#define CPIA2_MAJ_VER 2 +#define CPIA2_MAJ_VER 3 #define CPIA2_MIN_VER 0 #define CPIA2_PATCH_VER 0 @@ -396,8 +396,8 @@ struct camera_data { /* v4l */ int video_size; /* VIDEO_SIZE_ */ struct video_device *vdev; /* v4l videodev */ - struct video_picture vp; /* v4l camera settings */ - struct video_window vw; /* v4l capture area */ + u32 width; + u32 height; /* Its size */ __u32 pixelformat; /* Format fourcc */ /* USB */ |