From 3cfb8a657ecf765d1cbf4c35a4206ff6b2d9e951 Mon Sep 17 00:00:00 2001 From: BoyZonder Date: Mon, 27 Feb 2006 00:08:15 -0300 Subject: [PATCH] --- yaml --- r: 21659 b: refs/heads/master c: 4ab2b99b9f41a0a409030f1edb79a14ec2287e4b h: refs/heads/master i: 21657: cca46c321aa50523d2237550d7a761c2b2a3f8d2 21655: de7c58bb0bacd6f728118e724147dedfb8dc88ad v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bttv-input.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e8340aed953..e40ad4b0b2da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a9a5fbd33258b8e3e3b629a9f33254b6f1d883b +refs/heads/master: 4ab2b99b9f41a0a409030f1edb79a14ec2287e4b diff --git a/trunk/drivers/media/video/bttv-input.c b/trunk/drivers/media/video/bttv-input.c index c637677acefd..69efa0e5174d 100644 --- a/trunk/drivers/media/video/bttv-input.c +++ b/trunk/drivers/media/video/bttv-input.c @@ -328,6 +328,7 @@ int bttv_input_init(struct bttv *btv) ir->polling = 50; // ms break; case BTTV_BOARD_CONCEPTRONIC_CTVFMI2: + case BTTV_BOARD_CONTVFMI: ir_codes = ir_codes_pixelview; ir->mask_keycode = 0x001F00; ir->mask_keyup = 0x006000;