diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-13 12:19:59 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-13 12:19:59 -0200 |
| commit | 104f13788560d458a74d79ee40d91092da9f677a (patch) | |
| tree | 8e424565177847d3d0bea474386a0d48f5ef0fc7 /linux/drivers/media/video/bttv-input.c | |
| parent | 285261f76d30c3e9c258957f03408c048d2db004 (diff) | |
| parent | 78a23fbf2766f8a70e4a05812bf2e55a5df4f637 (diff) | |
| download | mediapointer-dvb-s2-104f13788560d458a74d79ee40d91092da9f677a.tar.gz mediapointer-dvb-s2-104f13788560d458a74d79ee40d91092da9f677a.tar.bz2 | |
Merging rmcc tree.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bttv-input.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 245fccc8e..8a619ddb1 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -330,6 +330,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; |