diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:15:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:15:47 -0300 |
| commit | 72f297be4182a7ebc0db2f38eb7ada75ad7b2ee4 (patch) | |
| tree | 25840a83ed6e07ec2ef82dc842884021ad66a4d2 /linux/drivers/media/dvb/ttusb-dec | |
| parent | 132006918b3990079761954e1c88e46ac2b52e45 (diff) | |
| download | mediapointer-dvb-s2-72f297be4182a7ebc0db2f38eb7ada75ad7b2ee4.tar.gz mediapointer-dvb-s2-72f297be4182a7ebc0db2f38eb7ada75ad7b2ee4.tar.bz2 | |
backport commit 0a2a736afa91e8a0402c9dbdaf2ee28481a50bd3
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: David Woodhouse <dwmw2@infradead.org>
Date: Thu May 29 19:50:06 2008 +0300
ttusb-budget: use request_firmware()
This patch will keep using the enclosed .h firmware for out-of-kernel
compilations.
For in-kernel compilation, it will use the firmware on a .bin file that is
linkedited together with dvb-ttusb-budget target.
On both cases, the firmware will be inside dvb-ttusb-budget.ko module.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 8491913aa..0fdcb19cb 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -1284,7 +1284,11 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) u8 b1[] = { 0x61 }; u8 *b; char idstring[21]; +#ifndef TTUSB_KERNEL u8 *firmware = NULL; +#else + const u8 *firmware = NULL; +#endif size_t firmware_size = 0; u16 firmware_csum = 0; __be16 firmware_csum_ns; |