From f8553699ab079cf3af4d211faa679e18bcc90d91 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 20 Feb 2006 22:31:12 -0500 Subject: set 'make ivtv-update' to depend on 'make ivtv' instead of 'make ivtv-checkout' From: Michael Krufky This ensures that ivtv-svnversion.h and the ivtv symlinks are present, in case 'make clean' was run prior to 'make ivtv-update' Signed-off-by: Michael Krufky --- v4l/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 1cbe00cbb..1fcb505b4 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -355,7 +355,7 @@ ivtv-checkout:: svn co http://ivtvdriver.org/svn/ivtv/trunk ivtv; \ fi -ivtv-update ivtv-up:: ivtv-checkout +ivtv-update ivtv-up:: ivtv @svn up ivtv ivtv-links:: ivtv-checkout -- cgit v1.2.3 From 08dc9fe76a3b0e971faad21836c53a655c4ec333 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 24 Feb 2006 00:42:02 -0300 Subject: Add cpia2 camera support From: Alan Cox There has been a CPIA2 driver out of kernel for a long time and it has been pretty clean for some time too. This is an import of the sourceforge driver which has been stripped of - 2.4 back compatibility - 2.4 old style MJPEG ioctls A couple of functions have been made static and the docs have been repackaged into Documentation/video4linux. The rvmalloc/free functions now match the cpia driver again. Other than that this is the code as is. Tested on x86-64 with a QX5 microscope. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab --- v4l/Make.config | 2 ++ v4l/Makefile | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 216674ce2..0dd4365ce 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -26,6 +26,8 @@ CONFIG_VIDEO_IVTV := n CONFIG_DVB_FIRESAT := n +CONFIG_VIDEO_CPIA2 := m + # doesn't build on older kernels CONFIG_DVB_CORE := n diff --git a/v4l/Makefile b/v4l/Makefile index 1cbe00cbb..eee941406 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -74,12 +74,13 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-ioread.o pvrusb2-debugifc.o dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o -ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ - ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ - ivtv-irq.o ivtv-mailbox.o ivtv-vbi.o ivtv-kthreads.o \ - ivtv-audio.o ivtv-ioctl.o ivtv-controls.o ivtv-video.o \ - ivtv-cards.o ivtv-yuv.o -ivtv-fb-objs := ivtv-osd.o ivtv-queue.o +ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ + ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ + ivtv-irq.o ivtv-mailbox.o ivtv-vbi.o ivtv-kthreads.o \ + ivtv-audio.o ivtv-ioctl.o ivtv-controls.o ivtv-video.o \ + ivtv-cards.o ivtv-yuv.o +ivtv-fb-objs := ivtv-osd.o ivtv-queue.o +cpia2-objs := cpia2_core.o cpia2_usb.o cpia2_v4l.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -109,6 +110,7 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ cs53l32a.o tda7432.o tda9875.o +obj-$(CONFIG_VIDEO_CPIA2) += cpia2.o obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx88-vp3054-i2c.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o -- cgit v1.2.3