aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/go7007
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-05 11:22:07 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:52:07 -0800
commit0484f2082ad97a48c805414c42dcd7b6b8f296f3 (patch)
tree8fff2fa5bcba1afc405b66236650ff1f8e8b4f83 /drivers/staging/go7007
parent9efb052563003c050cf2ad84632746968d414af9 (diff)
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>
Diffstat (limited to 'drivers/staging/go7007')
-rw-r--r--drivers/staging/go7007/go7007-v4l2.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index 2ca3877c7ae..4f7237a03ad 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -1091,7 +1091,6 @@ static int vidioc_s_parm(struct file *filp, void *priv,
The two functions bellow implements the newer ioctls
*/
-#if 0
static int vidioc_enum_framesizes(struct file *filp, void *priv,
struct v4l2_frmsizeenum *fsize)
{
@@ -1133,7 +1132,6 @@ static int vidioc_enum_frameintervals(struct file *filp, void *priv,
return 0;
}
-#endif
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_g_parm = vidioc_g_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_frameintervals = vidioc_enum_frameintervals,
-#endif
.vidioc_cropcap = vidioc_cropcap,
.vidioc_g_crop = vidioc_g_crop,
.vidioc_s_crop = vidioc_s_crop,