diff options
author | Ricardo Cerqueira <v4l\@cerqueira.org> | 2005-11-09 00:36:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:07 -0500 |
commit | cc9d8d49bb13fdcea521f907e120d3a7c7ce94f8 (patch) | |
tree | 6e032140664ea6822675749963ad2ea743d27ccf /drivers/media/video/bttv-cards.c | |
parent | 87f0783159783a315c68a00e50706cd01aa10511 (diff) |
[PATCH] v4l: 635: add bttv card 137 conceptronic ctvfmi v2
- Add bttv card 137 - Conceptronic CTVFMi v2
Signed-off-by: Ricardo Cerqueira <v4l\@cerqueira.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
-rw-r--r-- | drivers/media/video/bttv-cards.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 0881a17d5226..75033f06551f 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
@@ -2418,6 +2418,21 @@ struct tvcard bttv_tvcards[] = { | |||
2418 | .tuner_type = TUNER_YMEC_TVF66T5_B_DFF, | 2418 | .tuner_type = TUNER_YMEC_TVF66T5_B_DFF, |
2419 | .tuner_addr = 0xc1 >>1, | 2419 | .tuner_addr = 0xc1 >>1, |
2420 | .has_radio = 1, | 2420 | .has_radio = 1, |
2421 | },{ | ||
2422 | /* ---- card 0x89 ---------------------------------- */ | ||
2423 | .name = "Conceptronic CTVFMi v2", | ||
2424 | .video_inputs = 3, | ||
2425 | .audio_inputs = 1, | ||
2426 | .tuner = 0, | ||
2427 | .svhs = 2, | ||
2428 | .gpiomask = 0x001c0007, | ||
2429 | .muxsel = { 2, 3, 1, 1 }, | ||
2430 | .audiomux = { 0, 1, 2, 2, 3 }, | ||
2431 | .needs_tvaudio = 0, | ||
2432 | .pll = PLL_28, | ||
2433 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
2434 | .tuner_addr = ADDR_UNSET, | ||
2435 | .has_remote = 1, | ||
2421 | }}; | 2436 | }}; |
2422 | 2437 | ||
2423 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); | 2438 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |