diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 16:00:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 16:00:01 -0300 |
| commit | 0bc558f3ff40d347b70a653c5dfbe41a5e7f5297 (patch) | |
| tree | 28229107d6ff0af80c99b61d2ae3cab63a29bd3c /v4l | |
| parent | b4fa52875a7178aba434e217a9cd39d25805dbe9 (diff) | |
| parent | 24fde1a5a09b01f9b7557998aa9a88cff2ac844b (diff) | |
| download | mediapointer-dvb-s2-0bc558f3ff40d347b70a653c5dfbe41a5e7f5297.tar.gz mediapointer-dvb-s2-0bc558f3ff40d347b70a653c5dfbe41a5e7f5297.tar.bz2 | |
Merge from js tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 16 |
2 files changed, 11 insertions, 7 deletions
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..1a34c6f24 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 @@ -355,7 +357,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 |