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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3958f168fc57..b2aed29e2d74 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1384,13 +1384,13 @@ struct em28xx_board em28xx_boards[] = {
1384 .type = EM28XX_VMUX_COMPOSITE1, 1384 .type = EM28XX_VMUX_COMPOSITE1,
1385 .vmux = TVP5150_COMPOSITE1, 1385 .vmux = TVP5150_COMPOSITE1,
1386 .amux = EM28XX_AUDIO_SRC_LINE, 1386 .amux = EM28XX_AUDIO_SRC_LINE,
1387 .gpio = terratec_av350_unmute_gpio, 1387 .gpio = terratec_av350_unmute_gpio,
1388 1388
1389 }, { 1389 }, {
1390 .type = EM28XX_VMUX_SVIDEO, 1390 .type = EM28XX_VMUX_SVIDEO,
1391 .vmux = TVP5150_SVIDEO, 1391 .vmux = TVP5150_SVIDEO,
1392 .amux = EM28XX_AUDIO_SRC_LINE, 1392 .amux = EM28XX_AUDIO_SRC_LINE,
1393 .gpio = terratec_av350_unmute_gpio, 1393 .gpio = terratec_av350_unmute_gpio,
1394 } }, 1394 } },
1395 }, 1395 },
1396}; 1396};
@@ -1929,19 +1929,19 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
1929 case (EM2820_BOARD_TERRATEC_CINERGY_250): 1929 case (EM2820_BOARD_TERRATEC_CINERGY_250):
1930 ir->ir_codes = ir_codes_em_terratec; 1930 ir->ir_codes = ir_codes_em_terratec;
1931 ir->get_key = em28xx_get_key_terratec; 1931 ir->get_key = em28xx_get_key_terratec;
1932 snprintf(ir->c.name, sizeof(ir->c.name), 1932 snprintf(ir->name, sizeof(ir->name),
1933 "i2c IR (EM28XX Terratec)"); 1933 "i2c IR (EM28XX Terratec)");
1934 break; 1934 break;
1935 case (EM2820_BOARD_PINNACLE_USB_2): 1935 case (EM2820_BOARD_PINNACLE_USB_2):
1936 ir->ir_codes = ir_codes_pinnacle_grey; 1936 ir->ir_codes = ir_codes_pinnacle_grey;
1937 ir->get_key = em28xx_get_key_pinnacle_usb_grey; 1937 ir->get_key = em28xx_get_key_pinnacle_usb_grey;
1938 snprintf(ir->c.name, sizeof(ir->c.name), 1938 snprintf(ir->name, sizeof(ir->name),
1939 "i2c IR (EM28XX Pinnacle PCTV)"); 1939 "i2c IR (EM28XX Pinnacle PCTV)");
1940 break; 1940 break;
1941 case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): 1941 case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
1942 ir->ir_codes = ir_codes_hauppauge_new; 1942 ir->ir_codes = ir_codes_hauppauge_new;
1943 ir->get_key = em28xx_get_key_em_haup; 1943 ir->get_key = em28xx_get_key_em_haup;
1944 snprintf(ir->c.name, sizeof(ir->c.name), 1944 snprintf(ir->name, sizeof(ir->name),
1945 "i2c IR (EM2840 Hauppauge)"); 1945 "i2c IR (EM2840 Hauppauge)");
1946 break; 1946 break;
1947 case (EM2820_BOARD_MSI_VOX_USB_2): 1947 case (EM2820_BOARD_MSI_VOX_USB_2):