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.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 44f207780a49..5813509e3992 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4368,6 +4368,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
4368 case SAA7134_BOARD_AVERMEDIA_A16AR: 4368 case SAA7134_BOARD_AVERMEDIA_A16AR:
4369 case SAA7134_BOARD_ENCORE_ENLTV: 4369 case SAA7134_BOARD_ENCORE_ENLTV:
4370 case SAA7134_BOARD_ENCORE_ENLTV_FM: 4370 case SAA7134_BOARD_ENCORE_ENLTV_FM:
4371 case SAA7134_BOARD_10MOONSTVMASTER3:
4371 dev->has_remote = SAA7134_REMOTE_GPIO; 4372 dev->has_remote = SAA7134_REMOTE_GPIO;
4372 break; 4373 break;
4373 case SAA7134_BOARD_FLYDVBS_LR300: 4374 case SAA7134_BOARD_FLYDVBS_LR300:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index c0de37e3f5c6..817d4b62e222 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -333,6 +333,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
333 mask_keyup = 0x040000; 333 mask_keyup = 0x040000;
334 polling = 50; // ms 334 polling = 50; // ms
335 break; 335 break;
336 case SAA7134_BOARD_10MOONSTVMASTER3:
337 ir_codes = ir_codes_encore_enltv;
338 mask_keycode = 0x5f80000;
339 mask_keyup = 0x8000000;
340 polling = 50; //ms
341 break;
336 } 342 }
337 if (NULL == ir_codes) { 343 if (NULL == ir_codes) {
338 printk("%s: Oops: IR config error [card=%d]\n", 344 printk("%s: Oops: IR config error [card=%d]\n",