---

yaml --- r: 126649 b: refs/heads/master c: 0484f20 h: refs/heads/master i: 126647: 9906265 v: v3
git-mirror · Jan 6, 2009 · 378d413 · 378d413
1 parent 6746b0b
commit 378d413
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9efb052563003c050cf2ad84632746968d414af9
+refs/heads/master: 0484f2082ad97a48c805414c42dcd7b6b8f296f3
diff --git a/trunk/drivers/staging/go7007/go7007-v4l2.c b/trunk/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,