diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
| commit | 1cbfa6bb381bc427843d530820fb666d0ed9a310 (patch) | |
| tree | f74da7f181ead203e12e151a1a60f7eb5816dc3c /v4l | |
| parent | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (diff) | |
| parent | aa74e8c588686e857f1817a82211865bf3cc28e4 (diff) | |
| download | mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.gz mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.bz2 | |
Merge from mkrufky's cx88-ivtv 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 | 5 | ||||
| -rw-r--r-- | v4l/Makefile | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 802c847a2..39c6a118c 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -26,7 +26,9 @@ CONFIG_VIDEO_IVTV := n CONFIG_DVB_FIRESAT := n -CONFIG_VIDEO_CPIA2 := m +CONFIG_VIDEO_CPIA2 := m + +CONFIG_VIDEO_CX88_IVTV := n # doesn't build on older kernels @@ -112,3 +114,4 @@ ifeq ($(CONFIG_DVB_CORE),m) endif CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_CX88_IVTV := $(if $(wildcard $(src)/cx88-ivtv.c),m) diff --git a/v4l/Makefile b/v4l/Makefile index cf22a1125..d9250f64a 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -91,6 +91,7 @@ endif obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o +obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o @@ -311,8 +312,8 @@ 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 -inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko -inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko cx88-vp3054-i2c.ko +inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko +inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko inst_em28xx := em28xx.ko inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko @@ -374,6 +375,10 @@ ivtv:: ivtv-links @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h @echo ivtv trunk merged. Run make to build the entire tree. +cx88-ivtv:: + @echo creating cx88-ivtv symbolic links... + @ln -sf ../v4l_experimental/cx88-ivtv.c . + links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; |