---

yaml
---
r: 161503
b: refs/heads/master
c: d40a1da
h: refs/heads/master
i:
  161501: d3015ec
  161499: e9b3c35
  161495: e6a3754
  161487: 0e87a7c
  161471: c827f4c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e113595edf0741b45ba10ba88cb5d077787c155
+refs/heads/master: d40a1da2b4eb8f798175fdf98d92b83746a31a31

trunk/drivers/media/video/gspca/gspca.c

@@ -1492,12 +1492,6 @@ static int vidioc_s_parm(struct file *filp, void *priv,
 	return 0;
 }
 
-static int vidioc_s_std(struct file *filp, void *priv,
-			v4l2_std_id *parm)
-{
-	return 0;
-}
-
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 static int vidiocgmbuf(struct file *file, void *priv,
 			struct video_mbuf *mbuf)
@@ -1968,7 +1962,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
 	.vidioc_s_jpegcomp	= vidioc_s_jpegcomp,
 	.vidioc_g_parm		= vidioc_g_parm,
 	.vidioc_s_parm		= vidioc_s_parm,
-	.vidioc_s_std		= vidioc_s_std,
 	.vidioc_enum_framesizes = vidioc_enum_framesizes,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 	.vidioc_g_register	= vidioc_g_register,