summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/ChangeLog8
-rw-r--r--v4l/Makefile2
-rw-r--r--v4l/scripts/cardlist2
3 files changed, 10 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 88c11aa61..b0659a101 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-11 04:23 mchehab
+
+ * ../v4l/Makefile:
+ * ../v4l/scripts/cardlist:
+ - Fixed dir for em2820. Now at drivers/usb/media
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-10-11 04:01 mchehab
* ../linux/include/media/id.h:
diff --git a/v4l/Makefile b/v4l/Makefile
index d3abd4b07..f3dd3f804 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -168,7 +168,7 @@ default:: links .version
links::
@echo creating symbolic links...
@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
- @find ../linux/kernel/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+ @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
# for merged-trees:
@find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index 7253b1e03..ae8bfb59f 100644
--- a/v4l/scripts/cardlist
+++ b/v4l/scripts/cardlist
@@ -6,7 +6,7 @@ scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/vide
scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88
-./scripts/em2820.pl ../linux/kernel/drivers/usb/media/em2820-cards.c \
+./scripts/em2820.pl ../linux/drivers/usb/media/em2820-cards.c \
| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em2820
cat ../linux/drivers/media/video/tuner-simple.c \
| grep "{ \"" \