diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-devattr.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index e4d7c13cab87..6bc16c13ccef 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c | |||
@@ -58,7 +58,7 @@ static const char *pvr2_fw1_names_29xxx[] = { | |||
58 | }; | 58 | }; |
59 | 59 | ||
60 | static const struct pvr2_device_desc pvr2_device_29xxx = { | 60 | static const struct pvr2_device_desc pvr2_device_29xxx = { |
61 | .description = "WinTV PVR USB2 Model Category 29xxx", | 61 | .description = "WinTV PVR USB2 Model 29xxx", |
62 | .shortname = "29xxx", | 62 | .shortname = "29xxx", |
63 | .client_table.lst = pvr2_cli_29xxx, | 63 | .client_table.lst = pvr2_cli_29xxx, |
64 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_29xxx), | 64 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_29xxx), |
@@ -91,7 +91,7 @@ static const char *pvr2_fw1_names_24xxx[] = { | |||
91 | }; | 91 | }; |
92 | 92 | ||
93 | static const struct pvr2_device_desc pvr2_device_24xxx = { | 93 | static const struct pvr2_device_desc pvr2_device_24xxx = { |
94 | .description = "WinTV PVR USB2 Model Category 24xxx", | 94 | .description = "WinTV PVR USB2 Model 24xxx", |
95 | .shortname = "24xxx", | 95 | .shortname = "24xxx", |
96 | .client_table.lst = pvr2_cli_24xxx, | 96 | .client_table.lst = pvr2_cli_24xxx, |
97 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_24xxx), | 97 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_24xxx), |
@@ -340,7 +340,7 @@ static const char *pvr2_fw1_names_73xxx[] = { | |||
340 | }; | 340 | }; |
341 | 341 | ||
342 | static const struct pvr2_device_desc pvr2_device_73xxx = { | 342 | static const struct pvr2_device_desc pvr2_device_73xxx = { |
343 | .description = "WinTV HVR-1900 Model Category 73xxx", | 343 | .description = "WinTV HVR-1900 Model 73xxx", |
344 | .shortname = "73xxx", | 344 | .shortname = "73xxx", |
345 | .client_table.lst = pvr2_cli_73xxx, | 345 | .client_table.lst = pvr2_cli_73xxx, |
346 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), | 346 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), |
@@ -351,6 +351,7 @@ static const struct pvr2_device_desc pvr2_device_73xxx = { | |||
351 | .flag_has_analogtuner = !0, | 351 | .flag_has_analogtuner = !0, |
352 | .flag_has_composite = !0, | 352 | .flag_has_composite = !0, |
353 | .flag_has_svideo = !0, | 353 | .flag_has_svideo = !0, |
354 | .flag_fx2_16kb = !0, | ||
354 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | 355 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, |
355 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, | 356 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, |
356 | .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, | 357 | .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, |
@@ -445,7 +446,7 @@ static const char *pvr2_fw1_names_75xxx[] = { | |||
445 | }; | 446 | }; |
446 | 447 | ||
447 | static const struct pvr2_device_desc pvr2_device_750xx = { | 448 | static const struct pvr2_device_desc pvr2_device_750xx = { |
448 | .description = "WinTV HVR-1950 Model Category 750xx", | 449 | .description = "WinTV HVR-1950 Model 750xx", |
449 | .shortname = "750xx", | 450 | .shortname = "750xx", |
450 | .client_table.lst = pvr2_cli_73xxx, | 451 | .client_table.lst = pvr2_cli_73xxx, |
451 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), | 452 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), |
@@ -456,6 +457,7 @@ static const struct pvr2_device_desc pvr2_device_750xx = { | |||
456 | .flag_has_analogtuner = !0, | 457 | .flag_has_analogtuner = !0, |
457 | .flag_has_composite = !0, | 458 | .flag_has_composite = !0, |
458 | .flag_has_svideo = !0, | 459 | .flag_has_svideo = !0, |
460 | .flag_fx2_16kb = !0, | ||
459 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | 461 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, |
460 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, | 462 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, |
461 | .default_std_mask = V4L2_STD_NTSC_M, | 463 | .default_std_mask = V4L2_STD_NTSC_M, |
@@ -467,7 +469,7 @@ static const struct pvr2_device_desc pvr2_device_750xx = { | |||
467 | }; | 469 | }; |
468 | 470 | ||
469 | static const struct pvr2_device_desc pvr2_device_751xx = { | 471 | static const struct pvr2_device_desc pvr2_device_751xx = { |
470 | .description = "WinTV HVR-1950 Model Category 751xx", | 472 | .description = "WinTV HVR-1950 Model 751xx", |
471 | .shortname = "751xx", | 473 | .shortname = "751xx", |
472 | .client_table.lst = pvr2_cli_73xxx, | 474 | .client_table.lst = pvr2_cli_73xxx, |
473 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), | 475 | .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx), |
@@ -478,6 +480,7 @@ static const struct pvr2_device_desc pvr2_device_751xx = { | |||
478 | .flag_has_analogtuner = !0, | 480 | .flag_has_analogtuner = !0, |
479 | .flag_has_composite = !0, | 481 | .flag_has_composite = !0, |
480 | .flag_has_svideo = !0, | 482 | .flag_has_svideo = !0, |
483 | .flag_fx2_16kb = !0, | ||
481 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | 484 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, |
482 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, | 485 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, |
483 | .default_std_mask = V4L2_STD_NTSC_M, | 486 | .default_std_mask = V4L2_STD_NTSC_M, |