diff options
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 3 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 3 | ||||
-rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index b27d1c68e..16e864b16 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.96 2005/09/29 14:34:58 mchehab Exp $ + * $Id: saa7134-cards.c,v 1.97 2005/09/30 15:26:56 mchehab Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2862,6 +2862,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) dev->has_remote = 1; board_flyvideo(dev); break; + case SAA7134_BOARD_FLYTVPLATINUM_MINI2: case SAA7134_BOARD_FLYTVPLATINUM_FM: case SAA7134_BOARD_CINERGY400: case SAA7134_BOARD_CINERGY600: diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index 4e0f5b28a..960e126c4 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.30 2005/09/30 00:06:36 mkrufky Exp $ + * $Id: saa7134-input.c,v 1.31 2005/09/30 15:26:56 mchehab Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -519,6 +519,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) case SAA7134_BOARD_FLYVIDEO2000: case SAA7134_BOARD_FLYVIDEO3000: case SAA7134_BOARD_FLYTVPLATINUM_FM: + case SAA7134_BOARD_FLYTVPLATINUM_MINI2: ir_codes = flyvideo_codes; mask_keycode = 0xEC00000; mask_keydown = 0x0040000; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 270957e70..2438ce305 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-09-30 15:21 mchehab + + * saa7134-cards.c: (saa7134_board_init1): + * saa7134-input.c: (saa7134_input_init1): + - Added IR for LifeView FlyTV Platinum Mini2. + + Signed-off-by: Arnaud Patard <apatard@mandriva.com> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-09-30 00:01 mkrufky * bttv-cards.c, saa7134-input.c: @@ -72,6 +81,7 @@ * saa7134.h: - Added support for LifeView FlyTV Platinum Mini2. + Signed-off-by: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> 2005-09-29 14:23 mchehab |