summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-firmware.c2
-rw-r--r--v4l/ChangeLog8
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c
index 2c0672978..9bdb2d1b3 100644
--- a/linux/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c
@@ -25,7 +25,7 @@
#include "cx25840.h"
-#define FWFILE "cx25840.fw"
+#define FWFILE "v4l-cx25840.fw"
#define FWSEND 1024
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 005762d15..53c9deda3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-11 21:26 mkrufky
+
+ * ../linux/drivers/media/video/cx25840/cx25840-firmware.c:
+ - Ensure consistent v4l firmware prefixes.
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-11 20:32 rmcc
* ../linux/drivers/media/video/saa7134/saa7134-alsa.c: