diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 7 | ||||
| -rwxr-xr-x | v4l/scripts/cardlist | 2 | ||||
| -rwxr-xr-x | v4l/scripts/insmod.sh | 5 |
4 files changed, 9 insertions, 7 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 65bc8dfea..7d8ae8e8d 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -9,7 +9,6 @@ CONFIG_VIDEO_TVAUDIO := m CONFIG_VIDEO_CX88 := m CONFIG_TVP5150 := m -CONFIG_SAA711X := m #enable experimental support for xc3028 tuner CONFIG_XC3028 := m @@ -26,6 +25,7 @@ CONFIG_VIDEO_IVTV := n CONFIG_DVB_FIRESAT := n +CONFIG_VIRTUAL_DEVICE := m CONFIG_VIDEO_CPIA2 := m CONFIG_VIDEO_CX88_IVTV := n diff --git a/v4l/Makefile b/v4l/Makefile index a81db15c9..fd757e928 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -97,7 +97,6 @@ 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 obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o bt832.o @@ -109,6 +108,7 @@ ifeq ($(CONFIG_VIDEO_ALSA),y) # obj-$(CONFIG_VIDEO_BTTV) += bt87x.o endif +obj-$(CONFIG_VIRTUAL_DEVICE) += vivi.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134-oss.o obj-$(CONFIG_VIDEO_IR) += ir-common.o @@ -310,13 +310,12 @@ 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 += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko +inst_video += vivi.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 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 \ diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh index bf22a69ce..e4ebb1494 100755 --- a/v4l/scripts/insmod.sh +++ b/v4l/scripts/insmod.sh @@ -122,6 +122,8 @@ case "$1" in insmod ./saa6752hs.ko insmod ./em28xx.ko + insmod ./vivi.ko + echo ;; debug) @@ -232,6 +234,7 @@ case "$1" in insmod ./saa6752hs.ko insmod ./em28xx.ko + insmod ./vivi.ko echo ;; unload) @@ -246,7 +249,7 @@ case "$1" in # video4linux cards rmmod cx88-alsa cx88-blackbird cx88-dvb cx88-vp3054-i2c cx8802 cx8800 \ cx88xx saa7134-oss saa7134-alsa saa7134-empress saa7134-dvb \ - saa7134 dvb-bt8xx dst_ca dst bt878 bttv em28xx + saa7134 dvb-bt8xx dst_ca dst bt878 bttv em28xx vivi # frontends rmmod dib3000mb dib3000mc dib3000_common nxt200x ves1x93 \ |