From cf01451d7160c8c93edc5fbbfaadf2fbe1818faa Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 4 Jul 2005 01:15:08 +0000 Subject: * Makefile, cx88-dvb.c: - Let Kconfig decide whether to include frontend-specific code. Signed-off-by: Michael Krufky --- v4l/ChangeLog | 6 ++++++ v4l/Makefile | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'v4l') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index dbb1945fd..b74c0f9cc 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-07-03 21:11 mkrufky + * Makefile, cx88-dvb.c: + - Let Kconfig decide whether to include frontend-specific code. + + Signed-off-by: Michael Krufky + 2005-07-03 18:30 mchehab * tuner-core.c: - Added some comments about I2C working mode. diff --git a/v4l/Makefile b/v4l/Makefile index 8ee72293f..e2e705c89 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o -obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o # 2.6-only stuff @@ -58,6 +58,10 @@ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1 + EXTRA_CFLAGS += -DCONFIG_DVB_CX22702=1 + EXTRA_CFLAGS += -DCONFIG_DVB_OR51132=1 + EXTRA_CFLAGS += -DCONFIG_DVB_LGDT3302=1 + EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1 endif ################################################# @@ -138,7 +142,7 @@ install:: rminstall @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) - + -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -163,12 +167,12 @@ v4l_install:: rminstall -install -d $(DEST) install -m 644 -c $(inst-m) $(DEST) - + /sbin/depmod -a rminstall:: @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." - + -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ -- cgit v1.2.3