summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c3
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c3
-rw-r--r--v4l/ChangeLog9
3 files changed, 13 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 16e864b16..8f2bd98dd 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.97 2005/09/30 15:26:56 mchehab Exp $
+ * $Id: saa7134-cards.c,v 1.98 2005/10/03 19:40:13 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2881,6 +2881,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_VIDEOMATE_TV_PVR:
case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+ case SAA7134_BOARD_VIDEOMATE_DVBT_200:
case SAA7134_BOARD_MANLI_MTV001:
case SAA7134_BOARD_MANLI_MTV002:
case SAA7134_BOARD_BEHOLD_409FM:
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index 960e126c4..393a681a2 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.31 2005/09/30 15:26:56 mchehab Exp $
+ * $Id: saa7134-input.c,v 1.32 2005/10/03 19:40:13 mkrufky Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -583,6 +583,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
polling = 50; // ms
break;
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+ case SAA7134_BOARD_VIDEOMATE_DVBT_200:
ir_codes = videomate_tv_pvr_codes;
mask_keycode = 0x003F00;
mask_keyup = 0x040000;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 5f297faf1..2601de6d2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-03 19:37 mkrufky
+
+ * saa7134-cards.c: (saa7134_board_init1):
+ * saa7134-input.c: (saa7134_input_init1):
+ - enable support for the IR Remote on Compro Videomate T200
+
+ From: Andy Smith <linux-dvb@andrewsmith.plus.com>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-02 22:46 mchehab
* bttv-cards.c: (bttv_init_card2):