From bc8ffa59a8ca28d18784da684563210ceb5acd22 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 17 Jun 2006 07:48:03 -0300 Subject: Fix problems with AV7110 firmware building From: Trent Piepho Fix missing $() on variable name in dvb/ttpci/Makefile, prevented AV7110 firmware from building. Remove unnecessary and problematic defines in cflags from v4l/Makefile, they conflict with the kernel's autoconf.h and are are overridden by v4l/config-compat.h anyway. Fix AV7110 firmware dependencies so that parallel builds work correctly. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/ttpci/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile index c98c8e013..aa85ecdc6 100644 --- a/linux/drivers/media/dvb/ttpci/Makefile +++ b/linux/drivers/media/dvb/ttpci/Makefile @@ -15,9 +15,9 @@ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ hostprogs-y := fdump -ifeq (CONFIG_DVB_AV7110_FIRMWARE,y) -$(obj)/av7110.o: $(obj)/fdump $(obj)/av7110_firm.h +ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y) +$(obj)/av7110.o: $(obj)/av7110_firm.h -$(obj)/av7110_firm.h: +$(obj)/av7110_firm.h: $(obj)/fdump $(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@ endif -- cgit v1.2.3