aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 8bb2faf2635a..9600305771bc 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2807,6 +2807,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
2807/* case SAA7134_BOARD_SABRENT_SBTTVFM: */ /* not finished yet */ 2807/* case SAA7134_BOARD_SABRENT_SBTTVFM: */ /* not finished yet */
2808 case SAA7134_BOARD_VIDEOMATE_TV_PVR: 2808 case SAA7134_BOARD_VIDEOMATE_TV_PVR:
2809 case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: 2809 case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
2810 case SAA7134_BOARD_VIDEOMATE_DVBT_300:
2810 case SAA7134_BOARD_MANLI_MTV001: 2811 case SAA7134_BOARD_MANLI_MTV001:
2811 case SAA7134_BOARD_MANLI_MTV002: 2812 case SAA7134_BOARD_MANLI_MTV002:
2812 case SAA7134_BOARD_BEHOLD_409FM: 2813 case SAA7134_BOARD_BEHOLD_409FM:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index baf16a348f44..b69b18c5f189 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -578,6 +578,11 @@ int saa7134_input_init1(struct saa7134_dev *dev)
578 mask_keyup = 0x400000; 578 mask_keyup = 0x400000;
579 polling = 50; // ms 579 polling = 50; // ms
580 break; 580 break;
581 case SAA7134_BOARD_VIDEOMATE_DVBT_300:
582 ir_codes = videomate_tv_pvr_codes;
583 mask_keycode = 0x003F00;
584 mask_keyup = 0x040000;
585 break;
581 } 586 }
582 if (NULL == ir_codes) { 587 if (NULL == ir_codes) {
583 printk("%s: Oops: IR config error [card=%d]\n", 588 printk("%s: Oops: IR config error [card=%d]\n",