summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-17 07:48:03 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-17 07:48:03 -0300
commitbc8ffa59a8ca28d18784da684563210ceb5acd22 (patch)
tree0989c84039cb649b3c669de001f9c894b0289ee9 /v4l
parent2937fa2721fcd3b1b938c2fe924985845914361f (diff)
downloadmediapointer-dvb-s2-bc8ffa59a8ca28d18784da684563210ceb5acd22.tar.gz
mediapointer-dvb-s2-bc8ffa59a8ca28d18784da684563210ceb5acd22.tar.bz2
Fix problems with AV7110 firmware building
From: Trent Piepho <xyzzy@speakeasy.org> 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 <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile8
1 files changed, 0 insertions, 8 deletions
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)