diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 | ||||
| -rw-r--r-- | v4l/Makefile | 8 |
4 files changed, 18 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 4ce5ebc1a..b53e39323 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.53 2005/07/25 05:10:13 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.54 2005/07/25 05:13:50 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -32,6 +32,10 @@ #include <linux/config.h> #include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#undef HAVE_LGDT330X +#endif + #include "cx88.h" #include "dvb-pll.h" diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 91c043fe7..f9cd34056 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.24 2005/07/25 05:10:13 mkrufky Exp $ + * $Id: saa7134-dvb.c,v 1.25 2005/07/25 05:13:50 mkrufky Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -32,6 +32,10 @@ #include <linux/config.h> #include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#undef HAVE_TDA1004X +#endif + #include "saa7134-reg.h" #include "saa7134.h" diff --git a/v4l/ChangeLog b/v4l/ChangeLog index f4a076a1a..05b349268 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-07-25 05:12 mkrufky + * cx88-dvb.c, cx88-i2c.c, Makefile: + - Undo accidental change in previous commit. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-25 05:06 mkrufky * cx88-dvb.c, cx88-i2c.c, Makefile: * scripts/merge-trees.sh, scripts/unmerge-trees.sh: diff --git a/v4l/Makefile b/v4l/Makefile index b7c9b6f58..3d980c1be 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -39,8 +39,8 @@ 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 lgdt330x.o mt352.o -obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -123,7 +123,6 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko -inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko inst_video += video-buf.ko video-buf-dvb.ko @@ -150,9 +149,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common - -install -d $(KDIR26)/dvb/frontends - -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends - -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video |