From 15613f1608e009bf2f1d05d6539567790c1f341d Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 22 Aug 2009 14:43:50 -0300
Subject: [PATCH] --- yaml --- r: 161577 b: refs/heads/master c:
 ed44f66e4039dfc8fb7905078d546c83adf76811 h: refs/heads/master i:   161575:
 c00dc4c2752db12e4f00e82644961cf88824a54a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/bt8xx/bttv-cards.c | 1 +
 trunk/drivers/media/video/bt8xx/bttv-input.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f31378dc3d13..d8a33b99b999 100644
--- 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
index ca6558c394be..b42251fa96ba 100644
--- 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
index 2f289d981fe6..3e7b48e73b01 100644
--- 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;