* bttv-cards.c, bttv.h, ir-kbd-gpio.c:

        * doc/CARDLIST.bttv:
        - add bttv card 137 - Conceptronic CTVFMi v2
        - some ir buttons seem to be duplicated, explained
          by comments within source.

        Thanks to: Ricardo Cerqueira <v4l@cerqueira.org>
        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

1 files changed, 19 insertions, 1 deletions

diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index b772fd4f3..67d70b54d 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.71 2005/08/30 17:24:09 mkrufky Exp $
+    $Id: bttv-cards.c,v 1.72 2005/09/07 04:03:15 mkrufky Exp $
 
     bttv-cards.c
 
@@ -2459,6 +2459,24 @@ struct tvcard bttv_tvcards[] = {
 	.tuner_type	= TUNER_YMEC_TVF66T5_B_DFF,
 	.tuner_addr	= 0xc1 >>1,
 	.has_radio	= 1,
+},{
+	/* ---- card 0x89 ---------------------------------- */
+	.name           = "Conceptronic CTVFMi v2",
+	.video_inputs   = 3,
+	.audio_inputs   = 1,
+	.tuner          = 0,
+	.svhs           = 2,
+	.gpiomask       = 0x001c0007,
+	.muxsel         = { 2, 3, 1, 1 },
+	.audiomux       = { 0, 1, 2, 2, 3 },
+	.needs_tvaudio  = 0,
+	.pll            = PLL_28,
+	.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+	.tuner_addr	= ADDR_UNSET,
+	.has_remote     = 1,
+#if 0
+	.has_radio      = 1,
+#endif
 }};
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);