diff --git a/[refs] b/[refs]
index 6d2739258397..4f3f3a428502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a60e90749b844502bca1a7cd76755caf6f4548
+refs/heads/master: 9cf21c47ca2e983a0c69d0871cf20d81657d4099
diff --git a/trunk/drivers/media/pci/saa7134/saa7134-video.c b/trunk/drivers/media/pci/saa7134/saa7134-video.c
index 40245e42d431..3a2649f5485c 100644
--- a/trunk/drivers/media/pci/saa7134/saa7134-video.c
+++ b/trunk/drivers/media/pci/saa7134/saa7134-video.c
@@ -2250,12 +2250,6 @@ static int saa7134_streamoff(struct file *file, void *priv,
 	return 0;
 }
 
-static int saa7134_g_parm(struct file *file, void *fh,
-				struct v4l2_streamparm *parm)
-{
-	return 0;
-}
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int vidioc_g_register (struct file *file, void *priv,
 			      struct v4l2_dbg_register *reg)
@@ -2408,7 +2402,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 	.vidioc_g_fbuf			= saa7134_g_fbuf,
 	.vidioc_s_fbuf			= saa7134_s_fbuf,
 	.vidioc_overlay			= saa7134_overlay,
-	.vidioc_g_parm			= saa7134_g_parm,
 	.vidioc_g_frequency		= saa7134_g_frequency,
 	.vidioc_s_frequency		= saa7134_s_frequency,
 #ifdef CONFIG_VIDEO_ADV_DEBUG