[PATCH] pvrusb2: fix broken build due to patch order dependency (wasRe: linux-next: origin build failure)

[Michael Krufky]

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next build (Linus' tree only, powerpc ppc64_defconfig)
> fails like this:
> 
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:178: error: unknown field 'flag_has_analogtuner' specified in initializer
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:179: error: unknown field 'flag_has_composite' specified in initializer
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:180: error: unknown field 'flag_has_svideo' specified in initializer
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:182: error: unknown field 'digital_control_scheme' specified in initializer
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:182: error: 'PVR2_DIGITAL_SCHEME_HAUPPAUGE' undeclared here (not in a function)
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:183: error: unknown field 'led_scheme' specified in initializer
> drivers/media/video/pvrusb2/pvrusb2-devattr.c:183: error: 'PVR2_LED_SCHEME_HAUPPAUGE' undeclared here (not in a function)
> 
> Introduced by commit 92c9d07507f0a90b64172bfede7e6fa845e8e66b ("V4L/DVB
> (7497): pvrusb2: add new usb pid for 73xxx models").  I have reverted
> that commit for today's linux-next tree.
> 


Sorry about that.  Here is the fix.

From: Michael Krufky <mkrufky@xxxxxxxxxxx>
Date: Sun, 6 Apr 2008 20:40:17 -0400
Subject: [PATCH] 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: Michael Krufky <mkrufky@xxxxxxxxxxx>
---
 drivers/media/video/pvrusb2/pvrusb2-devattr.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 98557ce..fe9991c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -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
 };
 
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/