From b7a51db48cab467b6af5635b4b927baa0b75488d Mon Sep 17 00:00:00 2001
From: Marton Nemeth <nm127@freemail.hu>
Date: Wed, 29 Jul 2009 05:01:54 -0300
Subject: [PATCH] --- yaml --- r: 161503 b: refs/heads/master c:
 d40a1da2b4eb8f798175fdf98d92b83746a31a31 h: refs/heads/master i:   161501:
 d3015ec09950c60c4405f61babb187287199488e   161499:
 e9b3c357a83d7581369c3175e64bdce8b9daddfb   161495:
 e6a3754bdb1402be836c501d6f4ac500ee82181a   161487:
 0e87a7ca4b1db47ebacc5679df9ebdf51ca1c118   161471:
 c827f4ca8427879aad6594430ed2586a1ab3c8bc v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/gspca/gspca.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5519aea3e46a..fe1b75851462 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e113595edf0741b45ba10ba88cb5d077787c155
+refs/heads/master: d40a1da2b4eb8f798175fdf98d92b83746a31a31
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index 016599def6b5..cf6540da1e42 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/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,