diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 08:52:13 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 08:52:13 -0200 |
| commit | 04bfa3fb23489d1d50722447feae5b63fc820106 (patch) | |
| tree | 5d9db0fd5d7e834eb71e26566f1e7774ff39f364 /linux/drivers/media/video/tuner-core.c | |
| parent | 860dcd16b80026ccae1d77354939f945bbf36bec (diff) | |
| parent | 02070de48e42d30eeb6dfa4ea2d3aeff1a0a980f (diff) | |
| download | mediapointer-dvb-s2-04bfa3fb23489d1d50722447feae5b63fc820106.tar.gz mediapointer-dvb-s2-04bfa3fb23489d1d50722447feae5b63fc820106.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index fd62aa6bd..8d1f8bebf 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1127,7 +1127,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 = { |