From: Michael Krufky Date: Mon, 22 May 2006 13:31:55 +0000 (-0300) Subject: V4L/DVB (3971): Cx88-blackbird: use standard filename for cx23416 firmware X-Git-Tag: v2.6.18-rc1~862^2~130 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=861018a6a9b55ca1a5bf8cd0ff2d47944ce88827;p=~emulex%2Finfiniband.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 7a50ad4d737..997b9b87b54 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 */