diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-17 07:48:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-17 07:48:03 -0300 |
| commit | bc8ffa59a8ca28d18784da684563210ceb5acd22 (patch) | |
| tree | 0989c84039cb649b3c669de001f9c894b0289ee9 | |
| parent | 2937fa2721fcd3b1b938c2fe924985845914361f (diff) | |
| download | mediapointer-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>
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Makefile | 6 | ||||
| -rw-r--r-- | v4l/Makefile | 8 |
2 files changed, 3 insertions, 11 deletions
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 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) |