diff options
| -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) |