From ef22fccda5762b791bb7c5dae892791da609b9d4 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 17 Jun 2005 18:46:23 +0000 Subject: * Makefile, cx88-cards.c, cx88-dvb.c, cx88-i2c.c, cx88-mpeg.c, dvb-pll.c, dvb-pll.h, lgdt3302.c, lgdt3302.h, lgdt3302_priv.h - added support for LGDT3302 demod for cx88 cards: DViCO FusionHDTV 3 Gold Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky * Make.config - Allow DVB to compile if kernel is later than 2.6.10 --- v4l/ChangeLog | 12 ++++++++++++ v4l/Make.config | 11 ++--------- v4l/Makefile | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'v4l') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 3043e76b2..3d0352b84 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-06-17 14:44 mkrufky + * Makefile, cx88-cards.c, cx88-dvb.c, cx88-i2c.c, cx88-mpeg.c, dvb-pll.c, dvb-pll.h, lgdt3302.c, lgdt3302.h, lgdt3302_priv.h + + - added support for LGDT3302 demod for cx88 cards: + DViCO FusionHDTV 3 Gold + Signed-off-by: Mac Michaels + Signed-off-by: Michael Krufky + + * Make.config + + - Allow DVB to compile if kernel is later than 2.6.10 + 2005-06-17 16:50 mchehab * tda1004x.h: diff --git a/v4l/Make.config b/v4l/Make.config index d8d663e61..14542fe0a 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -11,16 +11,9 @@ CONFIG_TUNER_MULTI_I2C := y CONFIG_USE_I2C_RANGE := y # doesn't build on kernels older than 2.6.10 -# Hmm, need a more clever check once we have 2.6.11 ... CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n -ifeq ($(SUBLEVEL),10) +if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)) CONFIG_VIDEO_CX88_DVB := m +if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)) CONFIG_VIDEO_SAA7134_DVB := m -endif -ifeq ($(SUBLEVEL),11) - CONFIG_VIDEO_CX88_DVB := m - CONFIG_VIDEO_SAA7134_DVB := m -endif - - diff --git a/v4l/Makefile b/v4l/Makefile index 8bbaeaa1e..2b9ae9c62 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 +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o # 2.6-only stuff -- cgit v1.2.3