---

yaml --- r: 161577 b: refs/heads/master c: ed44f66 h: refs/heads/master i: 161575: c00dc4c v: v3
git-mirror · Sep 12, 2009 · 15613f1 · 15613f1
1 parent 5633fe1
commit 15613f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 200e861c511ded56783a3032f9d41fc6f1474e7a
+refs/heads/master: ed44f66e4039dfc8fb7905078d546c83adf76811
diff --git a/trunk/drivers/media/video/bt8xx/bttv-cards.c b/trunk/drivers/media/video/bt8xx/bttv-cards.c
@@ -1274,6 +1274,7 @@ struct tvcard bttv_tvcards[] = {
 		.pll            = PLL_28,
 		.tuner_type	= TUNER_TEMIC_PAL,
 		.tuner_addr	= ADDR_UNSET,
+		.has_remote	= 1,
 	},
 
 	/* ---- card 0x3c ---------------------------------- */

diff --git a/trunk/drivers/media/video/bt8xx/bttv-input.c b/trunk/drivers/media/video/bt8xx/bttv-input.c
@@ -308,6 +308,7 @@ int bttv_input_init(struct bttv *btv)
 		ir->mask_keyup   = 0x008000;
 		ir->polling      = 50; // ms
 		break;
+	case BTTV_BOARD_ASKEY_CPH03X:
 	case BTTV_BOARD_CONCEPTRONIC_CTVFMI2:
 	case BTTV_BOARD_CONTVFMI:
 		ir_codes         = ir_codes_pixelview;