summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-17 15:43:27 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-17 15:43:27 -0300
commit8f0f86249bec74bed8cdcc2c9e587990e2a1d003 (patch)
tree044b4dfefce05236d41b85ffb74325398ea403ed /v4l
parent2fc74336805f6956eb1b58852adf962315899b82 (diff)
parentaf5c304dd2ff48d0e3782f1db2c84f7d258642f1 (diff)
downloadmediapointer-dvb-s2-8f0f86249bec74bed8cdcc2c9e587990e2a1d003.tar.gz
mediapointer-dvb-s2-8f0f86249bec74bed8cdcc2c9e587990e2a1d003.tar.bz2
Merge from manu tree
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rwxr-xr-xv4l/scripts/cardlist2
1 files changed, 1 insertions, 1 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 \