OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: go7007: add some more v4l2 ioctls 

Now that the v4l2 tree is merged with mainline, enable some of
the compiled out functions.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-01-05 11:22:07 -08:00
parent 9efb052563
commit 0484f2082a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/go7007/go7007-v4l2.c
View File

@ -1091,7 +1091,6 @@ static int vidioc_s_parm(struct file *filp, void *priv,
The two functions bellow implements the newer ioctls The two functions bellow implements the newer ioctls
*/ */
#if 0
static int vidioc_enum_framesizes(struct file *filp, void *priv, static int vidioc_enum_framesizes(struct file *filp, void *priv,
struct v4l2_frmsizeenum *fsize) struct v4l2_frmsizeenum *fsize)
{ {
@ -1133,7 +1132,6 @@ static int vidioc_enum_frameintervals(struct file *filp, void *priv,
return 0; return 0;
} }
#endif
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std)
{ {
@ -1819,10 +1817,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
.vidioc_s_frequency = vidioc_s_frequency, .vidioc_s_frequency = vidioc_s_frequency,
.vidioc_g_parm = vidioc_g_parm, .vidioc_g_parm = vidioc_g_parm,
.vidioc_s_parm = vidioc_s_parm, .vidioc_s_parm = vidioc_s_parm,
#if 0 /* FIXME take out after 2.6.29-rc1 merge happens */
.vidioc_enum_framesizes = vidioc_enum_framesizes, .vidioc_enum_framesizes = vidioc_enum_framesizes,
.vidioc_enum_frameintervals = vidioc_enum_frameintervals, .vidioc_enum_frameintervals = vidioc_enum_frameintervals,
#endif
.vidioc_cropcap = vidioc_cropcap, .vidioc_cropcap = vidioc_cropcap,
.vidioc_g_crop = vidioc_g_crop, .vidioc_g_crop = vidioc_g_crop,
.vidioc_s_crop = vidioc_s_crop, .vidioc_s_crop = vidioc_s_crop,