diff options
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Makefile | 6 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 283902bac..4ad4f05b7 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-20 23:06 mkrufky + + * ../v4l/Makefile: + * ../v4l/compat.h: + - Enable cx24123 dvb frontend module + in merged v4l/dvb cvs trees and kernel >= 2.6.16 + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-20 15:48 mchehab * ../linux/drivers/media/video/bttv-cards.c: (identify_by_eeprom), diff --git a/v4l/Makefile b/v4l/Makefile index 392beb890..0bda5dc51 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -62,7 +62,7 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \ mt352.o tda1004x.o sp887x.o nxt6000.o \ - cx24110.o or51211.o nxt200x.o + cx24110.o or51211.o nxt200x.o cx24123.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -89,6 +89,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DHAVE_LGDT330X=1 EXTRA_CFLAGS += -DHAVE_MT352=1 EXTRA_CFLAGS += -DHAVE_NXT200X=1 + EXTRA_CFLAGS += -DHAVE_CX24123=1 endif ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m) EXTRA_CFLAGS += -DHAVE_MT352=1 @@ -174,7 +175,8 @@ inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko inst_em28xx := em28xx.ko inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko -inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko nxt200x.ko +inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko +inst_frontends += nxt200x.ko cx24123.ko v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) diff --git a/v4l/compat.h b/v4l/compat.h index df1fadb5d..3bb5c63bc 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.32 2005/11/12 23:12:53 hverkuil Exp $ + * $Id: compat.h,v 1.33 2005/11/20 23:10:47 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -141,6 +141,9 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) #undef HAVE_NXT200X #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) +#undef HAVE_CX24123 +#endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) |