From c652e86c520a930ce138a26e8b3a1008c12831d4 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 11 Dec 2005 18:11:56 +0000 Subject: Makes v4l compile under 2.4 kernels From: Mauro Carvalho Chehab kernel-sync - Makes V4L compile with kernel 2.4 - em28xx doesn't compile with 2.4 kernels. Additional work is necessary to make it compile. Thanks-to: Stefan Leichter Signed-off-by: Mauro Carvalho Chehab --- v4l/Makefile | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'v4l/Makefile') diff --git a/v4l/Makefile b/v4l/Makefile index 2461af80e..c55d7b7c6 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -9,7 +9,10 @@ include $(obj)/Make.config # symbol exports export-objs := video-buf.o v4l1-compat.o v4l2-common.o -export-objs += ir-common.o videodev.o +export-objs += ir-common.o +ifeq ($(CONFIG_VIDEO_DEV),m) +export-objs += videodev.o +endif export-objs += bttv-if.o btcx-risc.o export-objs += cx88-cards.o cx88-core.o export-objs += saa7134-core.o saa7134-tvaudio.o @@ -203,18 +206,33 @@ SNAPSHOT_CFLAGS := -DSNAPSHOT='$(shell cat $(snapshot))' EXTRA_CFLAGS += $(SNAPSHOT_CFLAGS) endif +# +# Need to compile with kernel 2.4 +# bttv.o: $(bttv-objs) $(LD) -r -o $@ $(bttv-objs) +cx25840.o: $(cx25840-objs) + $(LD) -g -r -o $@ $(cx25840-objs) + cx8800.o: $(cx8800-objs) $(LD) -g -r -o $@ $(cx8800-objs) +cx8802.o: $(cx8802-objs) + $(LD) -g -r -o $@ $(cx8802-objs) + cx88xx.o: $(cx88xx-objs) $(LD) -g -r -o $@ $(cx88xx-objs) +em28xx.o: $(em28xx-objs) + $(LD) -g -r -o $@ $(em28xx-objs) + saa7134.o: $(saa7134-objs) $(LD) -g -r -o $@ $(saa7134-objs) +tuner.o: $(tuner-objs) + $(LD) -g -r -o $@ $(tuner-objs) + -include $(TOPDIR)/Rules.make else # take version info from last module build if available @@ -243,7 +261,10 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko -inst_video += video-buf.ko video-buf-dvb.ko videodev.ko +inst_video += video-buf.ko video-buf-dvb.ko +ifeq ($(CONFIG_VIDEO_DEV),m) +inst_video += videodev.ko +endif inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko -- cgit v1.2.3