diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index b32a9126d..000840793 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.27 2005/12/23 13:01:27 mchehab Exp $ + * $Id: cx88-input.c,v 1.28 2006/01/05 20:59:56 mkrufky Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -540,6 +540,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->polling = 1; /* ms */ break; case CX88_BOARD_AVERTV_303: + case CX88_BOARD_AVERTV_STUDIO_303: ir_codes = ir_codes_avertv_303; ir->gpio_addr = MO_GP2_IO; ir->mask_keycode = 0xfb; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index c018b2f68..b0cc64df9 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-01-05 20:55 mkrufky + + * linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_init): + - Both AverTV Studio 303 cards, #6 and #36 use the same remote + control programming. + + Signed-off-by: George Gazurkoff <gazurkoff@gmail.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-05 19:31 rmcc * v4l/scripts/insmod.sh: |