diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
| commit | b68c5f546e951d718edf611c4bd9853753e4b366 (patch) | |
| tree | 9ee71557445ee9ead299ac3e3a5e7d994ab30ad9 /drivers/media/video/bt8xx/bttv-input.c | |
| parent | b0fea350ce515c6ae01e0f259d9b1ffdec824e22 (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
| download | blackbird-op-linux-b68c5f546e951d718edf611c4bd9853753e4b366.tar.gz blackbird-op-linux-b68c5f546e951d718edf611c4bd9853753e4b366.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index b41f81d2372c..933d6db09acb 100644 --- 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; |
