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 --- v4l/Makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 87fdc5270..d20e68d4e 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -47,14 +47,6 @@ ifeq ($(CONFIG_DVB_FIRESAT),m) EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/ endif -ifeq ($(CONFIG_DVB_AV7110_OSD),y) - EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1 -endif - -ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y) - EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE -endif - EXTRA_CFLAGS += -g EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL) -- cgit v1.2.3