diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
| commit | 005392231f73c7f7781c04eebf5869c0174f503e (patch) | |
| tree | a261d186361d85d130fe033cc63d575421800727 /linux/drivers/media/video/saa7134/saa6752hs.c | |
| parent | 59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff) | |
| parent | 2da45c822154d03cd7db86ac11b52385f1fac384 (diff) | |
| download | mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa6752hs.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa6752hs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c index 2b82466d4..860f271dd 100644 --- a/linux/drivers/media/video/saa7134/saa6752hs.c +++ b/linux/drivers/media/video/saa7134/saa6752hs.c @@ -46,7 +46,7 @@ #define MPEG_TOTAL_TARGET_BITRATE_MAX 27000 #define MPEG_PID_MAX ((1 << 14) - 1) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) /* Addresses to scan */ static unsigned short normal_i2c[] = {0x20, 0x21, I2C_CLIENT_END}; @@ -935,9 +935,6 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = { .g_ext_ctrls = saa6752hs_g_ext_ctrls, .s_ext_ctrls = saa6752hs_s_ext_ctrls, .try_ext_ctrls = saa6752hs_try_ext_ctrls, -}; - -static const struct v4l2_subdev_tuner_ops saa6752hs_tuner_ops = { .s_std = saa6752hs_s_std, }; @@ -948,7 +945,6 @@ static const struct v4l2_subdev_video_ops saa6752hs_video_ops = { static const struct v4l2_subdev_ops saa6752hs_ops = { .core = &saa6752hs_core_ops, - .tuner = &saa6752hs_tuner_ops, .video = &saa6752hs_video_ops, }; |