diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-04 12:49:41 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-04 12:49:41 -0400 |
| commit | 2c385b02114906a6056069225cc771449eaa7e5e (patch) | |
| tree | 073ff9e22b44a1deaaa6444e7a82c21faf82ed5e /linux/drivers/media | |
| parent | 41c8016db3ad2a330bd28bc5304f6ae4408d5cb8 (diff) | |
| download | mediapointer-dvb-s2-2c385b02114906a6056069225cc771449eaa7e5e.tar.gz mediapointer-dvb-s2-2c385b02114906a6056069225cc771449eaa7e5e.tar.bz2 | |
pvrusb2: use encoder firmware filename defined in cx2341x.h
From: Michael Krufky <mkrufky@linuxtv.org>
This patch removes the explicit definition of the cx23416 encoder
firmware image filename, in favor of CX2341X_FIRM_ENC_FILENAME
as defined in cx2341x.h
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 890aa4a06..333419d6f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -25,6 +25,7 @@ #include <linux/slab.h> #include <linux/firmware.h> #include <asm/semaphore.h> +#include <media/cx2341x.h> #include "pvrusb2.h" #include "pvrusb2-std.h" #include "pvrusb2-util.h" @@ -943,7 +944,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) int ret = 0; int fwidx; static const char *fw_files[] = { - "v4l-cx2341x-enc.fw", + CX2341X_FIRM_ENC_FILENAME, }; trace_firmware("pvr2_upload_firmware2"); |