diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-04 11:16:41 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-04 11:16:41 -0400 |
| commit | 41c8016db3ad2a330bd28bc5304f6ae4408d5cb8 (patch) | |
| tree | 3ab21acc6dbad2096cd25c5f3c8833df5509a912 /linux/drivers/media | |
| parent | dee79512a9d26c008623ef7b193eb7440567e186 (diff) | |
| download | mediapointer-dvb-s2-41c8016db3ad2a330bd28bc5304f6ae4408d5cb8.tar.gz mediapointer-dvb-s2-41c8016db3ad2a330bd28bc5304f6ae4408d5cb8.tar.bz2 | |
cx88-blackbird: use encoder firmware filename defined in cx2341x.h
From: Michael Krufky <mkrufky@linuxtv.org>
Since the filename of the cx23416 encoder firmware image
is defined in cx2341x.h, we don't need to explicitly define
it in cx88-blackbird.c anymore.
This changeset removes BLACKBIRD_FIRM_ENC_FILENAME,
replacing all occurrances with CX2341X_FIRM_ENC_FILENAME.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 844115b35..05904b655 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -57,7 +57,6 @@ static LIST_HEAD(cx8802_devlist); /* ------------------------------------------------------------------ */ -#define BLACKBIRD_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024 /* defines below are from ivtv-driver.h */ @@ -582,17 +581,17 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) dprintk(0, "Error with register_write\n"); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, + retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME, &dev->pci->dev); #else - retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, + retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME, pci_name(dev->pci)); #endif if (retval != 0) { dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n", - BLACKBIRD_FIRM_ENC_FILENAME); + CX2341X_FIRM_ENC_FILENAME); dprintk(0, "Please fix your hotplug setup, the board will " "not work without firmware loaded!\n"); return -1; |