summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky2006-05-22 15:31:55 +0200
committerMauro Carvalho Chehab2006-06-25 07:00:00 +0200
commit861018a6a9b55ca1a5bf8cd0ff2d47944ce88827 (patch)
treee513ad8de57f62e663169e398629346f851e0009 /drivers/media
parentV4L/DVB (3970): Cx88-blackbird: use firmware api commands defined in cx2341x.h (diff)
downloadkernel-qcow2-linux-861018a6a9b55ca1a5bf8cd0ff2d47944ce88827.tar.gz
kernel-qcow2-linux-861018a6a9b55ca1a5bf8cd0ff2d47944ce88827.tar.xz
kernel-qcow2-linux-861018a6a9b55ca1a5bf8cd0ff2d47944ce88827.zip
V4L/DVB (3971): Cx88-blackbird: use standard filename for cx23416 firmware
cx88-blackbird uses the same encoder firmware for the cx23416 chip that is used by ivtv and pvrusb2. This patch alters the driver to expect the cx23416 encoder firmware to be located in the file, "v4l-cx2341x-enc.fw", instead of using "blackbird-fw-enc.bin" Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 7a50ad4d737d..997b9b87b542 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -54,7 +54,7 @@ static LIST_HEAD(cx8802_devlist);
/* ------------------------------------------------------------------ */
-#define BLACKBIRD_FIRM_ENC_FILENAME "blackbird-fw-enc.bin"
+#define BLACKBIRD_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw"
#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
/* defines below are from ivtv-driver.h */