git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
bt8xx
/
bttv-input.c
diff --git
a/drivers/media/video/bt8xx/bttv-input.c
b/drivers/media/video/bt8xx/bttv-input.c
index b41f81d2372ccd8b4e0a25d95c8a57e6491d4915..933d6db09acb377025c8e23c8a67d8ac51dd39d2 100644
(file)
--- a/
drivers/media/video/bt8xx/bttv-input.c
+++ b/
drivers/media/video/bt8xx/bttv-input.c
@@
-303,6
+303,7
@@
int bttv_input_init(struct bttv *btv)
ir->mask_keyup = 0x010000;
ir->polling = 50; // ms
break;
+ case BTTV_BOARD_PV_M4900:
case BTTV_BOARD_PV_BT878P_9B:
case BTTV_BOARD_PV_BT878P_PLUS:
ir_codes = ir_codes_pixelview;