From 58d327de29eb15ead1fdeae1e550d7017af402e2 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 19 Dec 2008 07:07:56 -0300
Subject: [PATCH] --- yaml --- r: 124436 b: refs/heads/master c:
 49dd1315fae94ef6161f72c7be961560d3309f17 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/tuner-core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 = {