V4L/DVB (7575a): Revert changeset ef325d454685bece7cef698dd8d3145be0314e44

Due to the patch order change, pvrusb2 were broken. So, changeset
ef325d454685bece7cef698dd8d3145be0314e44 were applied at mainstream to fix.
After the pvrusb2 changes, this patch is no longer required and should be
reverted.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index c33ba35a4ddf66709beb766e4eea267d9a80ffe9..3434b0e6d675f8995cbf5ee33d4ac6893a04d559 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -218,16 +218,12 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
                .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
                .flag_has_cx25840 = !0,
                .flag_has_hauppauge_rom = !0,
-#if 0
                .flag_has_analogtuner = !0,
                .flag_has_composite = !0,
                .flag_has_svideo = !0,
                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
-#else
-               .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
-#endif
 };