summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile2
-rwxr-xr-xv4l/scripts/cardlist2
2 files changed, 1 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 178122097..fd757e928 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -310,9 +310,7 @@ 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 saa7134-alsa.ko saa7134-oss.ko
inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.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 \