[linux-dvb] [PATCH] Fix building of AV7110 without firmware

Trent Piepho xyzzy at speakeasy.org
Fri Jun 23 01:39:29 CEST 2006


A recent patch to that puts string options in the .myconfig (and thus
config-compat.h) file broke building AV7110 without compiled in firmware.

This will fix it quite simply.
-------------- next part --------------
# HG changeset patch
# User Trent Piepho <xyzzy at speakeasy.org>
# Node ID 05618eba3c72de587bfdea9f39cd9ee7a81ab86c
# Parent  7a150787b05f2305ad12c58a0e1dabec57e63155
Make _not_ building AV7110 work correctly

From: Trent Piepho <xyzzy at speakeasy.org>

The AV7110 driver firmware is controlled by two config options,
DVB_AV7110_FIRMWARE is boolean that turns it on, and
DVB_AV7110_FIRMWARE_FILE is a string with the firmware file name, which
depends on the boolean option.

The av7110.c file was looking at the string option to see if firmware
should be built.  The Kernel config programs will not define the string
option if the boolean is off.  The v4l-dvb Hg build system will always
define string options, even if their dependencies are missing.  The
firmware boolean would be off, the Makefile would think firmware was off,
but av7110.c would think firmware was on.

Two ways to fix this.  Get the v4l-dvb Hg build system to not define
strings options when their dependencies fail, or just change av7110.c to
use the boolean when it checks for firmware building.  This patch does
the latter, as it's a far simpler solution.

Signed-off-by: Trent Piepho <xyzzy at speakeasy.org>

diff -r 7a150787b05f -r 05618eba3c72 linux/drivers/media/dvb/ttpci/av7110.c
--- a/linux/drivers/media/dvb/ttpci/av7110.c	Thu Jun 22 14:56:39 2006 -0700
+++ b/linux/drivers/media/dvb/ttpci/av7110.c	Thu Jun 22 16:24:02 2006 -0700
@@ -1487,7 +1487,7 @@ static int check_firmware(struct av7110*
 	return 0;
 }
 
-#ifdef CONFIG_DVB_AV7110_FIRMWARE_FILE
+#ifdef CONFIG_DVB_AV7110_FIRMWARE
 #include "av7110_firm.h"
 static void put_firmware(struct av7110* av7110)
 {


More information about the linux-dvb mailing list