diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-08 16:54:07 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-08 16:54:07 +0100 |
| commit | 353e5d80477229b529e833f7a2dcb1b811eec932 (patch) | |
| tree | 7f6a80c33eb2d0abc7f77db00f3a338aaa62aaa9 | |
| parent | 929a54b1fb8a4c344167620c9679a99d065abc6e (diff) | |
| download | mediapointer-dvb-s2-353e5d80477229b529e833f7a2dcb1b811eec932.tar.gz mediapointer-dvb-s2-353e5d80477229b529e833f7a2dcb1b811eec932.tar.bz2 | |
ivtv: add support for Japanese variant of the Adaptec AVC-2410.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-cards.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-cards.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-cards.c b/linux/drivers/media/video/ivtv/ivtv-cards.c index 3289a7b9e..92e4b85f9 100644 --- a/linux/drivers/media/video/ivtv/ivtv-cards.c +++ b/linux/drivers/media/video/ivtv/ivtv-cards.c @@ -416,11 +416,10 @@ static const struct ivtv_card ivtv_card_avc2410 = { on the country/region setting of the user to decide which tuner is available. */ .tuners = { - /* This tuner has been verified for the AVC2410 */ { .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 }, - /* This is a good guess, but I'm not totally sure this is - the correct tuner for NTSC. */ - { .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FM1236_MK3 }, + { .std = V4L2_STD_ALL - V4L2_STD_NTSC_M_JP, + .tuner = TUNER_PHILIPS_FM1236_MK3 }, + { .std = V4L2_STD_NTSC_M_JP, .tuner = TUNER_PHILIPS_FQ1286 }, }, .pci_list = ivtv_pci_avc2410, .i2c = &ivtv_i2c_std, diff --git a/linux/drivers/media/video/ivtv/ivtv-cards.h b/linux/drivers/media/video/ivtv/ivtv-cards.h index 191aafdd9..9186fa2ee 100644 --- a/linux/drivers/media/video/ivtv/ivtv-cards.h +++ b/linux/drivers/media/video/ivtv/ivtv-cards.h @@ -119,7 +119,7 @@ #define IVTV_CARD_MAX_VIDEO_INPUTS 6 #define IVTV_CARD_MAX_AUDIO_INPUTS 3 -#define IVTV_CARD_MAX_TUNERS 2 +#define IVTV_CARD_MAX_TUNERS 3 /* SAA71XX HW inputs */ #define IVTV_SAA71XX_COMPOSITE0 0 |