Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c3b01f7 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds
Browse files

pvrusb2: fix broken build due to patch order dependency 



Fix broken build due to patch order dependency.  A future patch requires
the lines that break the current build.  Disable those lines for now.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff09e2af

drivers/media/video/pvrusb2/pvrusb2-devattr.c

+4 −0
Original line number Diff line number Diff line
@@ -175,12 +175,16 @@ 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

};