aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 87f77a34eea..aa4f45e692e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -911,7 +911,7 @@ struct em28xx_board em28xx_boards[] = {
911 .mts_firmware = 1, 911 .mts_firmware = 1,
912 .has_dvb = 1, 912 .has_dvb = 1,
913 .dvb_gpio = hauppauge_wintv_hvr_900_digital, 913 .dvb_gpio = hauppauge_wintv_hvr_900_digital,
914 .ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW, 914 .ir_codes = RC_MAP_HAUPPAUGE,
915 .decoder = EM28XX_TVP5150, 915 .decoder = EM28XX_TVP5150,
916 .input = { { 916 .input = { {
917 .type = EM28XX_VMUX_TELEVISION, 917 .type = EM28XX_VMUX_TELEVISION,
@@ -2430,7 +2430,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
2430 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; 2430 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
2431 break; 2431 break;
2432 case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: 2432 case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
2433 dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW; 2433 dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
2434 dev->init_data.get_key = em28xx_get_key_em_haup; 2434 dev->init_data.get_key = em28xx_get_key_em_haup;
2435 dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; 2435 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
2436 break; 2436 break;