From e0449a4964c2aec77cf02c33d2a9375b647530ce Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 27 Feb 2006 22:03:23 -0500 Subject: remove test for CONFIG_VIDEO_DEV to set inst_video += videodev.ko From: Michael Krufky The test " ifeq ($(CONFIG_VIDEO_DEV),m) " isn't working in the inst_foo section of the Makefile. Since we are already warning the user that errors may occur in the install step, it is safe to include videodev.ko whether or not it is actually present. Signed-off-by: Michael Krufky --- v4l/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 1a34c6f24..dcc8cc020 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -299,9 +299,7 @@ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko sa #inst_video += bt87x.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.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 From b7434f34ac55e387cc42b901baaad41e19151814 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 17 Mar 2006 21:01:39 +0400 Subject: fix Makefile and Kconfig From: Michael Krufky Signed-off-by: Michael Krufky Signed-off-by: Manu Abraham --- v4l/scripts/cardlist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index e368e6b4f..901d3fb18 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -1,6 +1,6 @@ #!/bin/sh -scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/video/bttv-cards.c \ +scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/media/video/bt8xx/bttv-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ -- cgit v1.2.3