diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:30:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:30:57 -0300 |
| commit | a2d61d5e75dc46a8005f240ab1d97ac83116c042 (patch) | |
| tree | a049a477becb2a3fde8070fc1c915579b5a93a0e /linux/drivers/media/dvb/ttusb-dec | |
| parent | 75e626f6a8de25ae7225cf0510c96d1fac4f23aa (diff) | |
| parent | 1f6dd4663794254732f38f41136d3b480dbabc59 (diff) | |
| download | mediapointer-dvb-s2-a2d61d5e75dc46a8005f240ab1d97ac83116c042.tar.gz mediapointer-dvb-s2-a2d61d5e75dc46a8005f240ab1d97ac83116c042.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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; |