aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b1c5d9516e22..62ca31d44b56 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2300,6 +2300,10 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
2300 dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table; 2300 dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table;
2301 dev->init_data.get_key = em28xx_get_key_em_haup; 2301 dev->init_data.get_key = em28xx_get_key_em_haup;
2302 dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; 2302 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
2303 case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
2304 dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
2305 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
2306 dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
2303 break; 2307 break;
2304 } 2308 }
2305 2309
@@ -2356,11 +2360,6 @@ void em28xx_card_setup(struct em28xx *dev)
2356 dev->board.has_msp34xx = 1; 2360 dev->board.has_msp34xx = 1;
2357 } 2361 }
2358 break; 2362 break;
2359 case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
2360 dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
2361 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
2362 dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
2363 break;
2364 } 2363 }
2365 case EM2882_BOARD_KWORLD_ATSC_315U: 2364 case EM2882_BOARD_KWORLD_ATSC_315U:
2366 em28xx_write_reg(dev, 0x0d, 0x42); 2365 em28xx_write_reg(dev, 0x0d, 0x42);