diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-17 18:30:29 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-17 18:30:29 -0600 |
| commit | 09b18d418a428399b3c393492efb0c8db4f70ea1 (patch) | |
| tree | 27be2cdcedf2e1e76427ff7fcec136983caf1264 /v4l/scripts | |
| parent | 0c57b11076a797902550b9f74763718edb825483 (diff) | |
| parent | b76cf1534a48158bfbafe1ed5497621198877e06 (diff) | |
| download | mediapointer-dvb-s2-09b18d418a428399b3c393492efb0c8db4f70ea1.tar.gz mediapointer-dvb-s2-09b18d418a428399b3c393492efb0c8db4f70ea1.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/cardlist | 2 | ||||
| -rwxr-xr-x | v4l/scripts/insmod.sh | 5 |
2 files changed, 5 insertions, 2 deletions
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 \ |