diff --git a/[refs] b/[refs]
index 47b8e00f5013..809fed540f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d81aa5c11f9da510a72cc48fd59689b3e91e3a
+refs/heads/master: 49dd1315fae94ef6161f72c7be961560d3309f17
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 22cf0c48b450..694087bfa77d 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -1112,7 +1112,9 @@ static int tuner_resume(struct i2c_client *c)
 static const struct v4l2_subdev_core_ops tuner_core_ops = {
 	.log_status = tuner_log_status,
 	.s_standby = tuner_s_standby,
+#ifdef CONFIG_VIDEO_ALLOW_V4L1
 	.ioctl = tuner_ioctl,
+#endif
 };
 
 static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = {