diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index b184d482c497..f46b8a5c3a61 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -562,7 +562,7 @@ struct em28xx_board em28xx_boards[] = { | |||
562 | .name = "Gadmei UTV330+", | 562 | .name = "Gadmei UTV330+", |
563 | .tuner_type = TUNER_TNF_5335MF, | 563 | .tuner_type = TUNER_TNF_5335MF, |
564 | .tda9887_conf = TDA9887_PRESENT, | 564 | .tda9887_conf = TDA9887_PRESENT, |
565 | .ir_codes = ir_codes_gadmei_rm008z, | 565 | .ir_codes = &ir_codes_gadmei_rm008z_table, |
566 | .decoder = EM28XX_SAA711X, | 566 | .decoder = EM28XX_SAA711X, |
567 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, | 567 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, |
568 | .input = { { | 568 | .input = { { |
@@ -736,7 +736,7 @@ struct em28xx_board em28xx_boards[] = { | |||
736 | .mts_firmware = 1, | 736 | .mts_firmware = 1, |
737 | .has_dvb = 1, | 737 | .has_dvb = 1, |
738 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 738 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
739 | .ir_codes = ir_codes_hauppauge_new, | 739 | .ir_codes = &ir_codes_hauppauge_new_table, |
740 | .decoder = EM28XX_TVP5150, | 740 | .decoder = EM28XX_TVP5150, |
741 | .input = { { | 741 | .input = { { |
742 | .type = EM28XX_VMUX_TELEVISION, | 742 | .type = EM28XX_VMUX_TELEVISION, |
@@ -761,7 +761,7 @@ struct em28xx_board em28xx_boards[] = { | |||
761 | .tuner_type = TUNER_XC2028, | 761 | .tuner_type = TUNER_XC2028, |
762 | .tuner_gpio = default_tuner_gpio, | 762 | .tuner_gpio = default_tuner_gpio, |
763 | .mts_firmware = 1, | 763 | .mts_firmware = 1, |
764 | .ir_codes = ir_codes_hauppauge_new, | 764 | .ir_codes = &ir_codes_hauppauge_new_table, |
765 | .decoder = EM28XX_TVP5150, | 765 | .decoder = EM28XX_TVP5150, |
766 | .input = { { | 766 | .input = { { |
767 | .type = EM28XX_VMUX_TELEVISION, | 767 | .type = EM28XX_VMUX_TELEVISION, |
@@ -787,7 +787,7 @@ struct em28xx_board em28xx_boards[] = { | |||
787 | .mts_firmware = 1, | 787 | .mts_firmware = 1, |
788 | .has_dvb = 1, | 788 | .has_dvb = 1, |
789 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 789 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
790 | .ir_codes = ir_codes_hauppauge_new, | 790 | .ir_codes = &ir_codes_hauppauge_new_table, |
791 | .decoder = EM28XX_TVP5150, | 791 | .decoder = EM28XX_TVP5150, |
792 | .input = { { | 792 | .input = { { |
793 | .type = EM28XX_VMUX_TELEVISION, | 793 | .type = EM28XX_VMUX_TELEVISION, |
@@ -813,7 +813,7 @@ struct em28xx_board em28xx_boards[] = { | |||
813 | .mts_firmware = 1, | 813 | .mts_firmware = 1, |
814 | .has_dvb = 1, | 814 | .has_dvb = 1, |
815 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 815 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
816 | .ir_codes = ir_codes_hauppauge_new, | 816 | .ir_codes = &ir_codes_hauppauge_new_table, |
817 | .decoder = EM28XX_TVP5150, | 817 | .decoder = EM28XX_TVP5150, |
818 | .input = { { | 818 | .input = { { |
819 | .type = EM28XX_VMUX_TELEVISION, | 819 | .type = EM28XX_VMUX_TELEVISION, |
@@ -839,7 +839,7 @@ struct em28xx_board em28xx_boards[] = { | |||
839 | .mts_firmware = 1, | 839 | .mts_firmware = 1, |
840 | .has_dvb = 1, | 840 | .has_dvb = 1, |
841 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 841 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
842 | .ir_codes = ir_codes_pinnacle_pctv_hd, | 842 | .ir_codes = &ir_codes_pinnacle_pctv_hd_table, |
843 | .decoder = EM28XX_TVP5150, | 843 | .decoder = EM28XX_TVP5150, |
844 | .input = { { | 844 | .input = { { |
845 | .type = EM28XX_VMUX_TELEVISION, | 845 | .type = EM28XX_VMUX_TELEVISION, |
@@ -865,7 +865,7 @@ struct em28xx_board em28xx_boards[] = { | |||
865 | .mts_firmware = 1, | 865 | .mts_firmware = 1, |
866 | .has_dvb = 1, | 866 | .has_dvb = 1, |
867 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 867 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
868 | .ir_codes = ir_codes_ati_tv_wonder_hd_600, | 868 | .ir_codes = &ir_codes_ati_tv_wonder_hd_600_table, |
869 | .decoder = EM28XX_TVP5150, | 869 | .decoder = EM28XX_TVP5150, |
870 | .input = { { | 870 | .input = { { |
871 | .type = EM28XX_VMUX_TELEVISION, | 871 | .type = EM28XX_VMUX_TELEVISION, |
@@ -891,7 +891,7 @@ struct em28xx_board em28xx_boards[] = { | |||
891 | .decoder = EM28XX_TVP5150, | 891 | .decoder = EM28XX_TVP5150, |
892 | .has_dvb = 1, | 892 | .has_dvb = 1, |
893 | .dvb_gpio = default_digital, | 893 | .dvb_gpio = default_digital, |
894 | .ir_codes = ir_codes_terratec_cinergy_xs, | 894 | .ir_codes = &ir_codes_terratec_cinergy_xs_table, |
895 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */ | 895 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */ |
896 | .input = { { | 896 | .input = { { |
897 | .type = EM28XX_VMUX_TELEVISION, | 897 | .type = EM28XX_VMUX_TELEVISION, |
@@ -1443,7 +1443,7 @@ struct em28xx_board em28xx_boards[] = { | |||
1443 | .mts_firmware = 1, | 1443 | .mts_firmware = 1, |
1444 | .decoder = EM28XX_TVP5150, | 1444 | .decoder = EM28XX_TVP5150, |
1445 | .tuner_gpio = default_tuner_gpio, | 1445 | .tuner_gpio = default_tuner_gpio, |
1446 | .ir_codes = ir_codes_kaiomy, | 1446 | .ir_codes = &ir_codes_kaiomy_table, |
1447 | .input = { { | 1447 | .input = { { |
1448 | .type = EM28XX_VMUX_TELEVISION, | 1448 | .type = EM28XX_VMUX_TELEVISION, |
1449 | .vmux = TVP5150_COMPOSITE0, | 1449 | .vmux = TVP5150_COMPOSITE0, |
@@ -1543,7 +1543,7 @@ struct em28xx_board em28xx_boards[] = { | |||
1543 | .mts_firmware = 1, | 1543 | .mts_firmware = 1, |
1544 | .has_dvb = 1, | 1544 | .has_dvb = 1, |
1545 | .dvb_gpio = evga_indtube_digital, | 1545 | .dvb_gpio = evga_indtube_digital, |
1546 | .ir_codes = ir_codes_evga_indtube, | 1546 | .ir_codes = &ir_codes_evga_indtube_table, |
1547 | .input = { { | 1547 | .input = { { |
1548 | .type = EM28XX_VMUX_TELEVISION, | 1548 | .type = EM28XX_VMUX_TELEVISION, |
1549 | .vmux = TVP5150_COMPOSITE0, | 1549 | .vmux = TVP5150_COMPOSITE0, |
@@ -2217,17 +2217,17 @@ void em28xx_register_i2c_ir(struct em28xx *dev) | |||
2217 | break; | 2217 | break; |
2218 | case (EM2800_BOARD_TERRATEC_CINERGY_200): | 2218 | case (EM2800_BOARD_TERRATEC_CINERGY_200): |
2219 | case (EM2820_BOARD_TERRATEC_CINERGY_250): | 2219 | case (EM2820_BOARD_TERRATEC_CINERGY_250): |
2220 | init_data.ir_codes = ir_codes_em_terratec; | 2220 | init_data.ir_codes = &ir_codes_em_terratec_table; |
2221 | init_data.get_key = em28xx_get_key_terratec; | 2221 | init_data.get_key = em28xx_get_key_terratec; |
2222 | init_data.name = "i2c IR (EM28XX Terratec)"; | 2222 | init_data.name = "i2c IR (EM28XX Terratec)"; |
2223 | break; | 2223 | break; |
2224 | case (EM2820_BOARD_PINNACLE_USB_2): | 2224 | case (EM2820_BOARD_PINNACLE_USB_2): |
2225 | init_data.ir_codes = ir_codes_pinnacle_grey; | 2225 | init_data.ir_codes = &ir_codes_pinnacle_grey_table; |
2226 | init_data.get_key = em28xx_get_key_pinnacle_usb_grey; | 2226 | init_data.get_key = em28xx_get_key_pinnacle_usb_grey; |
2227 | init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; | 2227 | init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; |
2228 | break; | 2228 | break; |
2229 | case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): | 2229 | case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): |
2230 | init_data.ir_codes = ir_codes_hauppauge_new; | 2230 | init_data.ir_codes = &ir_codes_hauppauge_new_table; |
2231 | init_data.get_key = em28xx_get_key_em_haup; | 2231 | init_data.get_key = em28xx_get_key_em_haup; |
2232 | init_data.name = "i2c IR (EM2840 Hauppauge)"; | 2232 | init_data.name = "i2c IR (EM2840 Hauppauge)"; |
2233 | break; | 2233 | break; |