diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
| commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
| tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /drivers/media/video/bt8xx/bttv-input.c | |
| parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
| download | op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz | |
Merge branch 'master' into upstream-fixes
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 b41f81d..933d6db 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; |
